From 8d41a1cb95bb9e5126bc8cc1b522c4650bd8dc1f Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Wed, 28 Mar 2018 13:45:21 -0700
Subject: Apex: Updates promotion jobs

Change-Id: I37c7b8b6e4bd19ef94b9b42fe2e5e89cc3e2da21
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 jjb/apex/apex.yml.j2 | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

(limited to 'jjb/apex/apex.yml.j2')

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index ecc6f270c..0bedd3560 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -27,6 +27,7 @@
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'master'
           disable_daily: false
+          disable_promote: false
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           gs-pathname: '/euphrates'
@@ -36,6 +37,7 @@
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'euphrates'
           disable_daily: true
+          disable_promote: true
       - danube: &danube
           branch: 'stable/danube'
           gs-pathname: '/danube'
@@ -46,6 +48,7 @@
           scenario_stream: 'danube'
           disabled: true
           disable_daily: true
+          disable_promote: true
 
     scenario:
       {%- for stream in scenarios %}
@@ -59,6 +62,10 @@
       - 'baremetal'
       - 'virtual'
 
+    os_version:
+      - 'pike'
+      - 'queens'
+      - 'master'
 - job-template:
     name: 'apex-runner-cperf-{stream}'
 
@@ -569,7 +576,7 @@
     #     branch:    branch (eg. stable)
     node: '{virtual-slave}'
     project-type: 'multijob'
-    disabled: false
+    disabled: '{disable_promote}'
 
     scm:
       - git-scm
@@ -595,21 +602,6 @@
       - timed: '0 12 * * 0'
 
     builders:
-      - multijob:
-          name: build
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-build-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: true
       - multijob:
           name: deploy-virtual
           condition: SUCCESSFUL
@@ -617,7 +609,7 @@
             - name: 'apex-deploy-virtual-{stream}'
               current-parameters: false
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-csit-noha
+                DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha
                 OPNFV_CLEAN=yes
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -635,7 +627,7 @@
             - name: 'functest-apex-virtual-suite-{stream}'
               current-parameters: false
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+                DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha
                 FUNCTEST_SUITE_NAME=tempest_smoke_serial
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
-- 
cgit 1.2.3-korg