X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-dovetail-jobs.yml;h=30c80e648ab1e515ab7aec826ece6db747f5a5bd;hb=20e7e881e5ee2d4247f31e541263c61d30d576a1;hp=46570cc6b80f0b8f693cd578afac47372e89e98d;hpb=0ae37d142ae4ce27b6ae7d35b2ca7d48ba36475c;p=releng.git

diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index 46570cc6b..30c80e648 100644
--- a/jjb/compass4nfv/compass-dovetail-jobs.yml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yml
@@ -6,8 +6,8 @@
 #----------------------------------
 # BRANCH ANCHORS
 #----------------------------------
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         gs-pathname: '/{stream}'
         disabled: false
@@ -20,14 +20,14 @@
     pod:
         - baremetal:
             slave-label: compass-baremetal
-            os-version: 'trusty'
-            <<: *colorado
+            os-version: 'xenial'
+            <<: *danube
 #-----------------------------------
 # scenarios
 #-----------------------------------
     scenario:
         - 'os-nosdn-nofeature-ha':
-            disabled: false
+            disabled: true
             auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'
 
     jobs:
@@ -63,7 +63,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - compass-ci-parameter:
+        - compass-dovetail-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -108,17 +108,6 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
-        - trigger-builds:
-            - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-weekly-{stream}'
@@ -153,7 +142,7 @@
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
-        - compass-ci-parameter:
+        - compass-dovetail-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - '{slave-label}-defaults'
@@ -175,12 +164,6 @@
         - shell:
             !include-raw-escape: ./compass-deploy.sh
 
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
-
 ########################
 # parameter macros
 ########################
@@ -198,13 +181,13 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
-                - 'mitaka'
+                - 'newton'
 
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-colorado-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-danube-trigger'
     triggers:
         - timed: 'H H * * 0'