From a97b6df03becc572ae29403b6069cc1496517088 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Thu, 12 Jul 2018 10:32:40 -0400
Subject: Apex: Allow for  multi-version snapshots

This patch adds ability to manage multiple snapshot versions. We want to
be able to have snapshots for noha and ha for multiple OS releases. This
adds that capability and updates the deploy script to be able to deploy
them. Also a user can specify which scenario to trigger with his ODL
netvirt commit by doing 'opnfv-check <os version>-<ha|noha>

Change-Id: I3884b41c86b55c187becfb83ef62f3431724d09e
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 jjb/apex/apex.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'jjb/apex/apex.yaml')

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index bf5f067d8..773577f97 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -8,7 +8,7 @@
       - 'apex-virtual-{stream}'
       - 'apex-deploy-{platform}-{stream}'
       - 'apex-daily-{stream}'
-      - 'apex-csit-promote-daily-{stream}-os-{os_version}'
+      - 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}'
       - 'apex-fdio-promote-daily-{stream}'
       - 'apex-{scenario}-baremetal-{scenario_stream}'
       - 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
@@ -209,6 +209,9 @@
       - 'master':
           os_scenario: 'nofeature'
 
+    topology:
+      - 'noha'
+      - 'ha'
 
 # Fetch Logs Job
 - job-template:
@@ -779,7 +782,7 @@
 
 # CSIT promote
 - job-template:
-    name: 'apex-csit-promote-daily-{stream}-os-{os_version}'
+    name: 'apex-csit-promote-daily-{stream}-os-{os_version}-{topology}'
 
     # Job template for promoting CSIT Snapshots
     #
@@ -807,6 +810,10 @@
           name: PROMOTE
           default: 'True'
           description: "Used for overriding the PROMOTE"
+      - string:
+          name: GS_URL
+          default: $GS_BASE{gs-pathname}/{os_version}/{topology}
+          description: "User for overriding GS_URL from apex params"
 
     properties:
       - build-blocker:
@@ -828,7 +835,7 @@
             - name: 'apex-virtual-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl-{os_scenario}-noha
+                DEPLOY_SCENARIO=os-odl-{os_scenario}-{topology}
                 OPNFV_CLEAN=yes
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
-- 
cgit 1.2.3-korg