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

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index f4919e4..ae21860 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -13,7 +13,7 @@
         - 'apex-csit-promote-daily-{stream}'
         - 'apex-fdio-promote-daily-{stream}'
         - 'apex-verify-iso-{stream}'
-        - 'apex-deploy-test-baremetal-{stream}'
+        - 'apex-run-deploy-test-baremetal-{stream}'
         - 'apex-upload-snapshot'
         - 'apex-create-snapshot'
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -545,7 +545,7 @@
 
 # Baremetal Deploy and Test
 - job-template:
-    name: 'apex-deploy-test-baremetal-{stream}'
+    name: 'apex-run-deploy-test-baremetal-{stream}'
 
     # Job template for daily build
     #
@@ -578,9 +578,9 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-verify.*'
-                - 'apex-deploy.*'
                 - 'apex-runner.*'
                 - 'apex-.*-promote.*'
+                - 'apex-run.*'
     builders:
         - description-setter:
             description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
@@ -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
@@ -664,7 +667,7 @@
                   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: true
@@ -678,9 +681,9 @@
                 - name: 'apex-verify-iso-danube'
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=apex-build-danube/.build
+                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-danube/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=''
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -692,7 +695,7 @@
             condition: SUCCESSFUL
             projects:
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -702,7 +705,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -712,7 +715,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -722,7 +725,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -732,7 +735,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -742,7 +745,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -752,7 +755,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -762,7 +765,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -772,7 +775,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -782,7 +785,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -792,7 +795,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -802,7 +805,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -812,7 +815,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -822,7 +825,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -832,7 +835,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -842,7 +845,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -852,7 +855,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -862,7 +865,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -872,7 +875,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -882,7 +885,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -892,7 +895,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -902,7 +905,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -912,7 +915,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -922,7 +925,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -932,7 +935,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -942,7 +945,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-danube'
+                - name: 'apex-run-deploy-test-baremetal-danube'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -995,7 +998,7 @@
                   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: true
@@ -1009,9 +1012,9 @@
                 - name: 'apex-verify-iso-master'
                   current-parameters: false
                   predefined-parameters: |
-                    BUILD_DIRECTORY=apex-build-master/.build
+                    BUILD_DIRECTORY=$WORKSPACE/../apex-build-master/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=''
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -1023,7 +1026,7 @@
             condition: SUCCESSFUL
             projects:
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1033,7 +1036,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1043,7 +1046,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1053,7 +1056,7 @@
                   abort-all-job: true
                   git-revision: false
 
-                - name: 'apex-deploy-test-baremetal-master'
+                - name: 'apex-run-deploy-test-baremetal-master'
                   node-parameters: false
                   current-parameters: false
                   predefined-parameters: |
@@ -1290,30 +1293,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
 ########################
@@ -1389,12 +1368,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:
@@ -1412,7 +1385,3 @@
     name: 'apex-danube'
     triggers:
         - timed: '0 12 * * *'
-- trigger:
-    name: 'apex-gs-clean-{stream}'
-    triggers:
-        - timed: '0 2 * * *'
\ No newline at end of file