Merge "StorPerf Iruya Verify Jobs"

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 3c1a7da..0767159 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -330,7 +330,7 @@
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{functest_tag}
           elif [ "{port}" = "None" ]; then
@@ -346,6 +346,7 @@
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/functest/.boto:/root/.boto \
             $image zip_campaign
 
 - job-template:

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 2d46a6a..98d0ae3 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -357,7 +357,7 @@
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{functest_tag}
           elif [ "{port}" = "None" ]; then
@@ -373,6 +373,7 @@
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/functest/.boto:/root/.boto \
             $image zip_campaign
 
 - job-template:

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 249c1d5..25a3d1e 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -422,7 +422,7 @@
 - project:
     name: 'functest-{tag}-zip'
     <<: *functest-params
-    container: 'healthcheck'
+    container: 'functest-healthcheck'
     jobs:
       - 'functest-{tag}-zip'
 

diff --git a/releases/iruya/yardstick.yaml b/releases/iruya/yardstick.yaml
new file mode 100644 (file)
index 0000000..428d231
--- /dev/null
+++ b/releases/iruya/yardstick.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 Huawei Technologies Co., Ltd. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: yardstick
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      yardstick: 13967af6479058515fea6c94c4d5b8dc9da536cc