Apex: updates cache to unique name

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 699bdb3..1e13cbd 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}'
@@ -184,6 +183,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
@@ -413,7 +413,12 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm
+        - git-scm-gerrit
+
+    wrappers:
+        - timeout:
+            timeout: 90
+            fail: true
 
     properties:
         - logrotate-default
@@ -493,6 +498,11 @@
     scm:
         - git-scm
 
+    wrappers:
+        - timeout:
+            timeout: 120
+            fail: true
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -618,7 +628,7 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{build-slave}'
+    node: 'apex-baremetal-danube'
 
     disabled: false
 
@@ -636,14 +646,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'
@@ -957,7 +959,7 @@
     #     branch:    branch (eg. stable)
     project-type: 'multijob'
 
-    node: '{build-slave}'
+    node: 'apex-baremetal-master'
 
     disabled: false
 
@@ -975,14 +977,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'
@@ -1198,7 +1192,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
@@ -1286,7 +1280,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
@@ -1337,7 +1331,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