Merge "improve: discard venv support for official product"

[releng.git] / jjb / armband / armband-verify-jobs.yml

diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index 9bfe4f4..56f70d6 100644 (file)
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -12,22 +12,20 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - euphrates:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: false
+            disabled: true
 #####################################
 # patch verification phases
 #####################################
     phase:
         - 'basic':
-            slave-label: 'opnfv-build-arm'
-        - 'build':
-            slave-label: 'opnfv-build-arm'
+            slave-label: 'opnfv-build-enea'
         - 'deploy-virtual':
-            slave-label: 'opnfv-build-arm'
+            slave-label: 'opnfv-build-enea'
         - 'smoke-test':
-            slave-label: 'opnfv-build-arm'
+            slave-label: 'opnfv-build-enea'
 #####################################
 # jobs
 #####################################
@@ -47,6 +45,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
@@ -85,6 +84,7 @@
                     pattern: 'ci/**'
                   - compare-type: ANT
                     pattern: 'patches/**'
+                disable-strict-forbidden-file-verification: 'true'
                 forbidden-file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
@@ -93,9 +93,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-arm-defaults'
+        - 'opnfv-build-enea-defaults'
         - 'armband-verify-defaults':
             gs-pathname: '{gs-pathname}'
 
@@ -109,21 +108,7 @@
                 - name: 'armband-verify-basic-{stream}'
                   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: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: build
-            condition: SUCCESSFUL
-            projects:
-                - name: 'armband-verify-build-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
@@ -137,7 +122,7 @@
                 - name: 'armband-verify-deploy-virtual-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
@@ -151,7 +136,7 @@
                 - name: 'armband-verify-smoke-test-{stream}'
                   current-parameters: false
                   predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
+                    BRANCH=$BRANCH
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
@@ -167,6 +152,7 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-total: 6
@@ -189,7 +175,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - '{slave-label}-defaults'
         - '{installer}-defaults'
@@ -211,14 +196,6 @@
 
             echo "Not activated!"
 
-- builder:
-    name: 'armband-verify-build-macro'
-    builders:
-        - shell:
-            !include-raw: ./build.sh
-        - shell:
-            !include-raw: ./armband-workspace-cleanup.sh
-
 - builder:
     name: 'armband-verify-deploy-virtual-macro'
     builders:
@@ -240,14 +217,6 @@
 - parameter:
     name: 'armband-verify-defaults'
     parameters:
-        - string:
-            name: BUILD_DIRECTORY
-            default: $WORKSPACE/build_output
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: CACHE_DIRECTORY
-            default: $HOME/opnfv/cache/$INSTALLER_TYPE
-            description: "Directory where the cache to be used during the build is located."
         - string:
             name: GS_URL
             default: artifacts.opnfv.org/$PROJECT{gs-pathname}