Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
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 699bdb3..ae21860 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -1,7 +1,6 @@
 - project:
     name: 'apex'
     project: 'apex'
-    build-slave: 'apex-build'
     jobs:
         - 'apex-verify-{stream}'
         - 'apex-verify-gate-{stream}'
@@ -14,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)
@@ -153,9 +152,8 @@
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -184,6 +182,7 @@
                 - name: 'apex-build-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    ARTIFACT_VERSION=$ARTIFACT_VERSION
                     GERRIT_BRANCH=$GERRIT_BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -199,16 +198,17 @@
                 - name: 'apex-deploy-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    ARTIFACT_VERSION=$ARTIFACT_VERSION
                     DEPLOY_SCENARIO={verify-scenario}
                     OPNFV_CLEAN=yes
                     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
+                  node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
-                  git-revision: false
+                  git-revision: true
         - multijob:
             name: functest-smoke
             condition: SUCCESSFUL
@@ -222,7 +222,7 @@
                   GERRIT_REFSPEC=$GERRIT_REFSPEC
                   GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                   GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                node-parameters: false
+                node-parameters: true
                 kill-phase-on: FAILURE
                 abort-all-job: true
                 git-revision: false
@@ -247,6 +247,10 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Used for overriding the GIT URL coming from parameters macro."
+        - string:
+            name: ARTIFACT_VERSION
+            default: dev
+            description: "Used for overriding the ARTIFACT_VERSION"
 
     scm:
         - git-scm-gerrit
@@ -281,11 +285,9 @@
             blocking-jobs:
                 - 'apex-daily.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
-                - 'apex-verify.*'
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -297,16 +299,17 @@
                 - name: 'apex-deploy-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
+                    ARTIFACT_VERSION=$ARTIFACT_VERSION
                     DEPLOY_SCENARIO=gate
                     OPNFV_CLEAN=yes
                     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
+                  node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true
-                  git-revision: false
+                  git-revision: true
         - multijob:
             name: functest-smoke
             condition: SUCCESSFUL
@@ -320,7 +323,7 @@
                   GERRIT_REFSPEC=$GERRIT_REFSPEC
                   GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                   GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                node-parameters: false
+                node-parameters: true
                 kill-phase-on: FAILURE
                 abort-all-job: true
                 git-revision: false
@@ -413,12 +416,17 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm
+        - git-scm-gerrit
+
+    wrappers:
+        - timeout:
+            timeout: 90
+            fail: true
 
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -491,7 +499,12 @@
     disabled: false
 
     scm:
-        - git-scm
+        - git-scm-gerrit
+
+    wrappers:
+        - timeout:
+            timeout: 120
+            fail: true
 
     parameters:
         - project-parameter:
@@ -515,6 +528,8 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*'
+                - 'functest.*'
+                - 'yardstick.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -530,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
     #
@@ -563,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"
@@ -578,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
@@ -618,7 +636,7 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{build-slave}'
+    node: 'apex-baremetal-danube'
 
     disabled: false
 
@@ -636,14 +654,6 @@
 
     properties:
         - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-                - 'apex-deploy.*'
-                - 'apex-runner.*'
-                - 'apex-.*-promote.*'
 
     triggers:
         - 'apex-danube'
@@ -657,7 +667,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -671,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_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -685,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: |
@@ -695,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: |
@@ -705,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: |
@@ -715,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: |
@@ -725,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: |
@@ -735,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: |
@@ -745,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: |
@@ -755,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: |
@@ -765,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: |
@@ -775,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: |
@@ -785,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: |
@@ -795,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: |
@@ -805,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: |
@@ -815,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: |
@@ -825,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: |
@@ -835,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: |
@@ -845,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: |
@@ -855,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: |
@@ -865,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: |
@@ -875,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: |
@@ -885,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: |
@@ -895,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: |
@@ -905,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: |
@@ -915,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: |
@@ -925,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: |
@@ -935,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: |
@@ -957,7 +967,7 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{build-slave}'
+    node: 'apex-baremetal-master'
 
     disabled: false
 
@@ -975,14 +985,6 @@
 
     properties:
         - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            block-level: 'NODE'
-            blocking-jobs:
-                - 'apex-verify.*'
-                - 'apex-deploy.*'
-                - 'apex-runner.*'
-                - 'apex-.*-promote.*'
 
     triggers:
         - 'apex-master'
@@ -996,7 +998,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -1010,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_REFSPEC=
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -1024,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: |
@@ -1034,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: |
@@ -1044,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: |
@@ -1054,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: |
@@ -1127,7 +1129,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
@@ -1198,7 +1199,7 @@
             name: upload snapshot
             condition: SUCCESSFUL
             projects:
-              - name: 'apex-create-snapshot'
+              - name: 'apex-upload-snapshot'
                 current-parameters: true
                 node-parameters: true
                 kill-phase-on: FAILURE
@@ -1235,7 +1236,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
@@ -1286,37 +1286,13 @@
             name: upload snapshot
             condition: SUCCESSFUL
             projects:
-              - name: 'apex-create-snapshot'
+              - name: 'apex-upload-snapshot'
                 current-parameters: true
                 node-parameters: true
                 kill-phase-on: FAILURE
                 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
 ########################
@@ -1337,7 +1313,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
         - string:
             name: CACHE_DIRECTORY
-            default: $HOME/opnfv/cache{gs-pathname}
+            default: $HOME/opnfv/apex-cache{gs-pathname}
             description: "Directory where the cache to be used during the build is located."
         - string:
             name: GIT_BASE
@@ -1392,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:
@@ -1415,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