Revert "Apex: fixes build directory passing for iso upload"

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

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index ade876c..d739a70 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -152,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'
 
@@ -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
@@ -423,7 +426,7 @@
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 1
+            max-per-node: 3
             max-total: 10
             option: 'project'
 
@@ -496,7 +499,7 @@
     disabled: false
 
     scm:
-        - git-scm
+        - git-scm-gerrit
 
     wrappers:
         - timeout:
@@ -525,6 +528,8 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*'
+                - 'functest.*'
+                - 'yardstick.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -659,7 +664,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
@@ -675,7 +680,7 @@
                   predefined-parameters: |
                     BUILD_DIRECTORY=apex-build-{{ stream }}/.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
@@ -760,7 +765,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'
 
@@ -868,7 +872,6 @@
             blocking-jobs:
                 - 'apex-verify.*'
                 - 'apex-deploy.*'
-                - 'apex-build.*'
                 - 'apex-runner.*'
                 - 'apex-daily.*'