X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-engine.yaml;h=34bd879aac1e950f52f8a91f0ef6b44b607460d5;hb=e921738689626876f05977326bb267e139617b22;hp=a64d69c49e1f652f708c4f29547e6b857492dabd;hpb=cde0f9dece6d879e7a4313bd902eec4aa14465e1;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index a64d69c4..34bd879a 100644
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -50,17 +50,18 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
 
     distro:
       - ubuntu1804:
+          slave-label: vpod-deploy-ubuntu1804
           disabled: false
           successful: false
           failed: false
           unstable: false
           notbuilt: false
       - centos7:
-          disabled: false
+          slave-label: vpod-deploy-centos7
+          disabled: true
           successful: true
           failed: true
           unstable: true
@@ -70,8 +71,10 @@
       - virtual
 
     phase:
-      - deploy
-      - functest
+      - deploy:
+          build-timeout: 90
+      - functest:
+          build-timeout: 30
 
     jobs:
       - 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
@@ -93,7 +96,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-city'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRO
@@ -125,11 +128,11 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{distro}-.*'
-            - 'cloud-infra-verify-scenario-{distro}-.*'
-            - 'cloud-infra-periodic-engine-{distro}-.*'
-            - 'cloud-infra-os-.*'
-            - 'cloud-infra-k8-.*'
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
+            - 'cloud-infra-periodic-engine-.*'
+            - 'k8-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -137,29 +140,58 @@
           option: project
 
     wrappers:
+      - credentials-binding:
+          - file:
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+              variable: OPENRC_FILE
+      - mask-passwords
       - build-timeout:
           timeout: 120
       - fix-workspace-permissions
+      - openstack:
+          single-use: True
 
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
-      - nordix-gerrit-trigger-patchset-created:
-          project: 'infra\/engine'
-          branch: '{branch}'
-          files: '**'
-          custom-url: '* $JOB_NAME $BUILD_URL'
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'REG_EXP'
+              project-pattern: 'infra\/engine'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '**'
           skip-vote:
             successful: '{obj:successful}'
             failed: '{obj:failed}'
             unstable: '{obj:unstable}'
             notbuilt: '{obj:notbuilt}'
+          custom-url: '* $JOB_NAME $BUILD_URL'
 
     builders:
+      - shell: |
+          #!/bin/bash
+          cp $OPENRC_FILE /tmp/openrc
       - 'cloud-infra-determine-scenario-macro'
       - multijob:
           name: deploy
@@ -249,8 +281,13 @@
           default: 'false'
 
     wrappers:
+      - credentials-binding:
+          - file:
+              credential-id: est-jenkins-openrcfile-city-karlskrona-onap
+              variable: OPENRC_FILE
+      - mask-passwords
       - build-timeout:
-          timeout: 120
+          timeout: '{build-timeout}'
       - fix-workspace-permissions
 
     scm:
@@ -258,6 +295,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
 
     builders:
       - 'cloud-infra-determine-scenario-macro'