X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml.j2;h=5ad652f9a83402190ebe253adcf014158bddfca2;hb=ac064a646ce80514a7a8bb70ea452a64ad1f3f30;hp=5f024965c583204d7bde20694252a1d80ccfe7f4;hpb=726b96c6746aba86c253a5505561a4d96426115f;p=releng.git

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 5f024965c..5ad652f9a 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -86,7 +86,7 @@
 
     os_version:
       - 'queens':
-          os_scenario: 'queens'
+          os_scenario: 'nofeature'
           odl_branch: 'stable/oxygen'
       - 'rocky':
           os_scenario: 'rocky'
@@ -293,6 +293,7 @@
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
             - 'odl-netvirt.*'
+            - 'apex-.*-promote.*'
       - throttle:
           max-per-node: 1
           max-total: 10
@@ -730,7 +731,7 @@
           description: "Used for overriding the PROMOTE"
       - string:
           name: GS_URL
-          default: $GS_BASE{gs-pathname}/{os_version}/{topology}
+          default: 'artifacts.opnfv.org/apex/{os_version}/{topology}'
           description: "User for overriding GS_URL from apex params"
       - string:
           name: OS_VERSION
@@ -740,7 +741,10 @@
           name: ODL_BRANCH
           default: '{odl_branch}'
           description: ODL branch being used
-
+      - string:
+          name: FORCE_PROMOTE
+          default: 'False'
+          description: "Used to force promotion and skip CSIT"
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -800,6 +804,7 @@
                 SSH_KEY_PATH=/tmp/csit/id_rsa
                 ODL_CONTAINERIZED=true
                 OS_VERSION=$OS_VERSION
+                SKIP_CSIT=$FORCE_PROMOTE
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false