Merge "Stop running tempest full and scenario if healthcheck fails"

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index aa9ec2c..708b445 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -871,7 +871,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 bd8e98a..85ebbdf 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -717,7 +717,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-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