Apex: fix deploy and test run job to pass empty refspec

Change-Id: I563b961286fe215c4e5381ccde30d787188f1e8e
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 861b713..ae21860 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -593,6 +593,9 @@
                   current-parameters: true
                   predefined-parameters: |
                     OPNFV_CLEAN=yes
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=
+                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: false

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 1df6e15..3f10e21 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -593,6 +593,9 @@
                   current-parameters: true
                   predefined-parameters: |
                     OPNFV_CLEAN=yes
+                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    GERRIT_REFSPEC=
+                    DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                   kill-phase-on: FAILURE
                   abort-all-job: true
                   git-revision: false
@@ -929,30 +932,6 @@
                 abort-all-job: true
                 git-revision: false
 
-- job-template:
-    name: 'apex-gs-clean-{stream}'
-
-    # Job template for clean
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    node: '{slave}'
-
-    disabled: false
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - apex-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    builders:
-        - 'apex-gs-clean'
-
-    triggers:
-        - 'apex-gs-clean-{stream}'
-
 ########################
 # parameter macros
 ########################
@@ -1028,12 +1007,6 @@
         - shell:
             !include-raw: ./apex-download-artifact.sh
 
-- builder:
-    name: 'apex-gs-cleanup'
-    builders:
-        - shell:
-            !include-raw: ./apex-gs-cleanup.sh
-
 - builder:
     name: 'apex-deploy'
     builders:
@@ -1051,7 +1024,4 @@
     name: 'apex-danube'
     triggers:
         - timed: '0 12 * * *'
-- trigger:
-    name: 'apex-gs-clean-{stream}'
-    triggers:
-        - timed: '0 2 * * *'
+