Merge "Run Functest hunter containers if Apex Rocky"

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 564417c..ba0e8ce 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -874,7 +874,7 @@
           description: "Used for overriding the PROMOTE"
       - string:
           name: GS_URL
-          default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}'
+          default: 'artifacts.opnfv.org/apex/{os_version}/{topology}'
           description: "User for overriding GS_URL from apex params"
       - string:
           name: OS_VERSION

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index ec73553..b85356e 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -720,7 +720,7 @@
           description: "Used for overriding the PROMOTE"
       - string:
           name: GS_URL
-          default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}'
+          default: 'artifacts.opnfv.org/apex/{os_version}/{topology}'
           description: "User for overriding GS_URL from apex params"
       - string:
           name: OS_VERSION

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index c2cfed9..f0733b6 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -43,6 +43,7 @@ run_tiers() {
             echo ${ret_value} > ${ret_val_file}
             if [ ${tier} == 'healthcheck' ]; then
                 echo "Healthcheck tier failed. Exiting Functest..."
+                skip_tests=1
                 break
             fi
         fi
@@ -131,7 +132,7 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
 
 ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
-if [ "${INSTALLER_TYPE}" == 'apex' ]; then
+if [[ "${INSTALLER_TYPE}" == 'apex' ]] || [[ "${INSTALLER_TYPE}" == 'compass' ]]; then
     envs="${envs} -e STORAGE_PROTOCOL=ceph"
 fi
 
@@ -186,6 +187,7 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then
     run_tiers ${tiers}
 else
     tests=(tempest_full tempest_scenario)
+    skip_tests=0
     if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
         if [[ ${BRANCH} == "stable/fraser" ]]; then
             tiers=(healthcheck smoke features vnf parser)
@@ -202,7 +204,9 @@ else
         fi
     fi
     run_tiers ${tiers}
-    for test in "${tests[@]}"; do
-        run_test "$test"
-    done
+    if [ ${skip_tests} -eq 0 ]; then
+        for test in "${tests[@]}"; do
+            run_test "$test"
+        done
+    fi
 fi

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 3b3adab..8d3883a 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -102,6 +102,18 @@
           slave-label: compass-arm-virtual
           installer: compass
           <<: *fraser
+      - baremetal:
+          slave-label: compass-baremetal
+          installer: compass
+          <<: *gambia
+      - virtual:
+          slave-label: compass-virtual
+          installer: compass
+          <<: *gambia
+      - arm-virtual:
+          slave-label: compass-arm-virtual
+          installer: compass
+          <<: *gambia
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master

diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml
index a312338..1c622ac 100644 (file)
--- a/jjb/yardstick/yardstick-daily-jobs.yaml
+++ b/jjb/yardstick/yardstick-daily-jobs.yaml
@@ -161,6 +161,16 @@
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *fraser
+      - baremetal:
+          slave-label: compass-baremetal
+          installer: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
+      - virtual:
+          slave-label: compass-virtual
+          installer: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal