X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fverify-jobs%2Fengine-verify-deploy-test.yaml;fp=jjb%2Fengine%2Fverify-jobs%2Fengine-verify-online-deploy-test.yaml;h=e0a47b0a790d7fb0e657b763e6f21f665276537c;hb=4a7b8bbfa2bcfb080107108e32abd43dd8e6cfe6;hp=c48db3fa1398d8199e898a016448213eb3a3d9f2;hpb=f8c4417e91987394d067a0628eae5b263f6b3d3c;p=infra%2Fcicd.git diff --git a/jjb/engine/verify-jobs/engine-verify-online-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml similarity index 60% rename from jjb/engine/verify-jobs/engine-verify-online-deploy-test.yaml rename to jjb/engine/verify-jobs/engine-verify-deploy-test.yaml index c48db3fa..e0a47b0a 100644 --- a/jjb/engine/verify-jobs/engine-verify-online-deploy-test.yaml +++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml @@ -18,15 +18,33 @@ # ============LICENSE_END========================================================= - project: - name: 'engine-verify-online-deploy-test' + name: 'engine-verify-deploy-test' - project: 'engine-verify-online-deploy-test' + project: 'engine-verify-deploy-test' stream: - 'master': branch: '{stream}' + + environment-type: + - online: + disabled: false + execution-mode: online-deployment pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml' idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml' + successful: false + failed: false + unstable: false + notbuilt: false + - offline: + disabled: false + execution-mode: offline-deployment + pdf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-pdf.yml' + idf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-idf.yml' + successful: false + failed: false + unstable: false + notbuilt: false phase: - deploy @@ -36,9 +54,11 @@ - virtual: provisioner-type: 'bifrost' slave-type: 'vpod' + gated-projects: 'infra\/engine|infra\/provisioner\/bifrost\/|infra\/installer\/kolla\/|infra\/installer\/kubespray\/' - cloud: provisioner-type: 'heat' slave-type: 'jumphost' + gated-projects: 'infra\/engine|infra\/provisioner\/heat\/|infra\/installer\/kolla\/|infra\/installer\/kubespray\/' distro: - ubuntu1804 @@ -48,11 +68,11 @@ openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap' jobs: - - 'engine-verify-online-deploy-test-{distro}-{cloud}-{type}-{stream}' - - 'engine-verify-online-{phase}-{distro}-{cloud}-{type}-{stream}' + - 'engine-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}' + - 'engine-verify-{environment-type}-{phase}-{distro}-{cloud}-{type}-{stream}' - job-template: - name: 'engine-verify-online-deploy-test-{distro}-{cloud}-{type}-{stream}' + name: 'engine-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}' project-type: multijob @@ -69,10 +89,22 @@ name: SLAVE_LABEL default: 'engine-{slave-type}-online-{distro}' description: 'Slave label to schedule this job on.' + - string: + name: EXECUTION_MODE + default: '{execution-mode}' + description: 'Execution mode to run in' - string: name: PROVISIONER_TYPE default: '{provisioner-type}' description: 'Provisioner type to use' + - string: + name: INSTALLER_TYPE + default: 'kubespray' + description: 'Installer type to use' + - string: + name: DEPLOY_SCENARIO + default: 'k8-calico-nofeature' + description: 'Scenario to deploy' - string: name: PDF default: '{pdf}' @@ -117,6 +149,26 @@ name: DELETE_STACK default: 'true' description: 'Delete the stack upon completion of the build' + - string: + name: VERBOSITY + default: 'true' + description: 'Verbosity setting for the engine - true or false - default is false' + - string: + name: NORDIX_ARM_PUBLIC_IP + default: '91.106.198.25' + description: 'Public IP of Nordix Artifactory. Offline deployments can not resolve domain name' + - string: + name: NORDIX_ARM_HTTPS_URL + default: 'https://artifactory.nordix.org/artifactory' + description: 'URL to Nordix Artifactory' + - string: + name: NORDIX_ARM_REPO + default: 'nordix-kubernetes' + description: 'Name of the repository to upload and download artifact to/from. Depends on the stack' + - string: + name: ARTIFACT_TO_DOWNLOAD + default: "https://artifactory.nordix.org/artifactory/nordix-kubernetes/installer/oss/gerrit/$GERRIT_CHANGE_ID/k8s-installer-ubuntu1804.bsx" + description: 'Artifact to download' properties: - logrotate @@ -149,27 +201,58 @@ wipe_workspace: true clean_before: false + triggers: + - 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: '{gated-projects}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|releasenotes/**' + skip-vote: + successful: '{obj:successful}' + failed: '{obj:failed}' + unstable: '{obj:unstable}' + notbuilt: '{obj:notbuilt}' + custom-url: '* $JOB_NAME $BUILD_URL' + readable-message: 'true' + dependency-jobs: 'engine-verify-tox-{stream},engine-verify-package-{distro}-{stream}' + builders: - - 'download-artifact-macro' - - 'generate-ssh-keypair-macro' - - 'wait-pkg-mgr-macro' - multijob: - name: "online deployment on {type} instances" + name: "{environment-type} deployment on {type} instances" condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'engine-verify-online-deploy-{distro}-city-{type}-master' + - name: 'engine-verify-{environment-type}-deploy-{distro}-city-{type}-master' current-parameters: true + git-revision: true node-parameters: true kill-phase-on: FAILURE abort-all-job: false - multijob: - name: "online testing on {type} instances" + name: "{environment-type} testing on {type} instances" condition: SUCCESSFUL execution-type: PARALLEL projects: - - name: 'engine-verify-online-functest-{distro}-city-{type}-master' + - name: 'engine-verify-{environment-type}-functest-{distro}-city-{type}-master' current-parameters: true + git-revision: false node-parameters: true kill-phase-on: FAILURE abort-all-job: false @@ -189,7 +272,7 @@ - 'delete-stack-macro' - job-template: - name: 'engine-verify-online-{phase}-{distro}-{cloud}-{type}-{stream}' + name: 'engine-verify-{environment-type}-{phase}-{distro}-{cloud}-{type}-{stream}' disabled: '{obj:disabled}' @@ -225,4 +308,7 @@ clean_before: false builders: + - 'generate-ssh-keypair-macro' + - 'wait-pkg-mgr-macro' + - 'download-artifact-macro' - '{phase}-macro'