X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-verify-engine.yaml;h=33447806d972787c0136539dd262664475962e74;hb=2fc1c774cc2972caaf6ca0bff7cc8aa7f01b3e95;hp=25e55dd324be0fe45e9ec6756e397cdd828deab9;hpb=ed6187cb1bf76a35dd9df1d14b22ab1a68cad699;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 25e55dd3..33447806 100644
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -50,35 +50,44 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
 
-    os:
+    distro:
       - ubuntu1804:
-          disabled: 'false'
-          distribution: 'ubuntu18'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: 'bionic'
-          dib_os_element: 'ubuntu-minimal'
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
       - centos7:
-          disabled: 'true'
-          distribution: 'centos7'
-          ipa_dib_os_element: 'coreos'
-          dib_os_release: '7'
-          dib_os_element: 'centos-minimal'
+          disabled: true
+          successful: true
+          failed: true
+          unstable: true
+          notbuilt: true
+    cloud:
+      - city:
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
 
     type:
-      - virtual
+      - virtual:
+          provisioner-type: 'bifrost'
+          slave-type: 'vpod'
+      - cloud:
+          provisioner-type: 'heat'
+          slave-type: 'jumphost'
 
     phase:
-      - deploy
-      - functest
+      - deploy:
+          build-timeout: 90
+      - functest:
+          build-timeout: 60
 
     jobs:
-      - 'cloud-infra-verify-engine-{os}-{type}-{stream}'
-      - 'cloud-infra-verify-engine-{os}-{phase}-{type}-{stream}'
+      - 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'
+      - 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
 - job-template:
-    name: 'cloud-infra-verify-engine-{os}-{type}-{stream}'
+    name: 'cloud-infra-verify-engine-{distro}-{cloud}-{type}-{stream}'
 
     project-type: multijob
 
@@ -93,36 +102,44 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-city'
+          default: '{cloud}-{slave-type}-{distro}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
-          name: DISTRIBUTION
-          default: '{distribution}'
+          name: DISTRO
+          default: '{distro}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
+      - string:
+          name: PROVISIONER_TYPE
+          default: '{provisioner-type}'
+          description: 'Provisioner type to use'
       - string:
           name: DEPLOY_TYPE
           default: '{type}'
           description: 'Type of the deployment'
+      - string:
+          name: HEAT_ENVIRONMENT_FILENAME
+          default: 'heat-environment-{cloud}-{distro}.yaml'
+          description: 'Name of heat-environment file to use.'
+      - string:
+          name: STACK_NAME
+          default: "nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
+          description: 'Name of the created stack'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
-      - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: '{ipa_dib_os_element}'
-          description: 'DIB OS Element to use for building the ramdisk image'
-      - string:
-          name: DIB_OS_RELEASE
-          default: '{dib_os_release}'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with'
-      - string:
-          name: DIB_OS_ELEMENT
-          default: '{dib_os_element}'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
       - string:
           name: TEST_SUITE
           default: 'healthcheck'
           description: 'Test suite to run'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
+      - string:
+          name: DELETE_STACK
+          default: 'yes'
+          description: 'Delete the stack upon completion of the build'
       - string:
           name: CLEANUP
           default: 'true'
@@ -133,11 +150,11 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'cloud-infra-verify-engine-{os}-.*'
-            - 'cloud-infra-verify-scenario-{os}-.*'
-            - 'cloud-infra-periodic-engine-{os}-.*'
-            - '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
@@ -145,37 +162,72 @@
           option: project
 
     wrappers:
+      - credentials-binding:
+          - file:
+              credential-id: '{openrc-credentials-file}'
+              variable: OPENRC_FILE
+      - mask-passwords
       - build-timeout:
-          timeout: 120
+          timeout: 150
       - 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: '**'
+      - 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
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-engine-{os}-deploy-{type}-{stream}'
+            - name: 'cloud-infra-verify-engine-{distro}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -189,16 +241,17 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'cloud-infra-verify-engine-{os}-functest-{type}-{stream}'
+            - name: 'cloud-infra-verify-engine-{distro}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
-                DISTRIBUTION=$DISTRIBUTION
+                DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
+                STACK_NAME=$STACK_NAME
+                HEAT_ENVIRONMENT_FILENAME=$HEAT_ENVIRONMENT_FILENAME
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
-                IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
-                DIB_OS_RELEASE=$DIB_OS_RELEASE
-                DIB_OS_ELEMENT=$DIB_OS_ELEMENT
                 TEST_SUITE=$TEST_SUITE
+                YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
                 CLEANUP=$CLEANUP
                 GERRIT_PROJECT=$GERRIT_PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -209,8 +262,24 @@
               kill-phase-on: FAILURE
               abort-all-job: true
 
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - SUCCESS
+                - FAILURE
+                - ABORTED
+                - NOT_BUILT
+                - UNSTABLE
+              build-steps:
+                - shell:
+                    !include-raw-escape: ./wait-for-pkg-manager.sh
+                - shell:
+                    !include-raw: ./delete-heat-stack.sh
+
 - job-template:
-    name: 'cloud-infra-verify-engine-{os}-{phase}-{type}-{stream}'
+    name: 'cloud-infra-verify-engine-{distro}-{phase}-{type}-{stream}'
 
     disabled: false
 
@@ -224,29 +293,33 @@
           name: PROJECT
           default: $GERRIT_PROJECT
       - string:
-          name: DISTRIBUTION
-          default: 'ubuntu18'
+          name: DISTRO
+          default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
       - string:
           name: DEPLOY_TYPE
           default: 'virtual'
           description: 'Type of the deployment. Overriden by upstream job.'
       - string:
-          name: USE_PREBUILT_DEPLOYMENT_IMAGE
-          default: 'false'
-          description: 'Use prebuilt deployment image while running as part of CI/CD'
+          name: PROVISIONER_TYPE
+          default: 'bifrost'
+          description: 'Provisioner type to use. Overriden by upstream job.'
       - string:
-          name: IPA_DIB_OS_ELEMENT
-          default: 'fedora'
-          description: 'DIB OS Element to use for building the ramdisk image. Overriden by upstream job.'
+          name: HEAT_ENVIRONMENT_FILENAME
+          default: "heat-environment-city-ubuntu1804.yaml"
+          description: 'Name of heat-environment file to use.'
       - string:
-          name: DIB_OS_RELEASE
-          default: 'bionic'
-          description: 'DIB OS Release to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
+          name: HEAT_ENVIRONMENT_FILE
+          default: "file://$WORKSPACE/engine/provisioner/heat/playbooks/roles/install-configure-heat/files/$HEAT_ENVIRONMENT_FILENAME"
+          description: 'Location of heat-environment file to use.'
       - string:
-          name: DIB_OS_ELEMENT
-          default: 'ubuntu-minimal'
-          description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
+          name: STACK_NAME
+          default: "nordix-cicd-verify-engine-{distro}-$BUILD_NUMBER"
+          description: 'Name of the created stack'
+      - string:
+          name: USE_PREBUILT_DEPLOYMENT_IMAGE
+          default: 'false'
+          description: 'Use prebuilt deployment image while running as part of CI/CD'
       - string:
           name: TEST_FW
           default: '{phase}'
@@ -259,13 +332,18 @@
           name: TEST_REPO_URL
           default: 'https://gerrit.nordix.org/infra/test.git'
           description: 'URL to Nordix Cloud Infra test repository'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: CLEANUP
           default: 'false'
 
     wrappers:
+      - mask-passwords
       - build-timeout:
-          timeout: 120
+          timeout: '{build-timeout}'
       - fix-workspace-permissions
 
     scm:
@@ -273,6 +351,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'