X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yml;h=a9646073e1227266dc6524d0e6a59438db86fdc8;hb=04a5f0c39cbcfb7a4f47eccc6c9ecb297df346f1;hp=4137bff1254938710aa58727cf30380d7fae7089;hpb=d094ccc52e37fd57940fcee41cb038e3d4a51fc9;p=releng.git

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4137bff12..a9646073e 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -183,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
@@ -198,16 +199,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
@@ -221,7 +223,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
@@ -246,6 +248,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
@@ -296,16 +302,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
@@ -319,7 +326,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
@@ -412,7 +419,12 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm
+        - git-scm-gerrit
+
+    wrappers:
+        - timeout:
+            timeout: 90
+            fail: true
 
     properties:
         - logrotate-default
@@ -490,7 +502,12 @@
     disabled: false
 
     scm:
-        - git-scm
+        - git-scm-gerrit
+
+    wrappers:
+        - timeout:
+            timeout: 120
+            fail: true
 
     parameters:
         - project-parameter:
@@ -1276,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
 ########################
@@ -1320,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
@@ -1375,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:
@@ -1398,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