Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
engine: Fine tune release jobs
[infra/cicd.git]
/
jjb
/
engine
/
verify-jobs
/
engine-verify-deployment-parent-jobs.yaml
diff --git
a/jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
b/jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
similarity index 90%
rename from
jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
rename to
jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
index ab95a5b05cfc7d69fd49e29f1c90561ea42b5f21..169435277c71f9036e1491c80eda9ffde5d9a9ed 100644
(file)
--- a/
jjb/engine/engine-verify-jobs/engine-verify-deployment-parent-jobs.yaml
+++ b/
jjb/engine/verify-jobs/engine-verify-deployment-parent-jobs.yaml
@@
-52,7
+52,7
@@
jobs:
- 'engine-verify-{environment-type}-{distro}-{cloud}-{stream}'
jobs:
- 'engine-verify-{environment-type}-{distro}-{cloud}-{stream}'
- - 'engine-verify-packag
ing
-{distro}-{stream}'
+ - 'engine-verify-packag
e
-{distro}-{stream}'
- job-template:
name: 'engine-verify-{environment-type}-{distro}-{cloud}-{stream}'
- job-template:
name: 'engine-verify-{environment-type}-{distro}-{cloud}-{stream}'
@@
-84,6
+84,14
@@
name: VERBOSITY
default: 'true'
description: 'Verbosity setting for the engine - true or false - default is false'
name: VERBOSITY
default: 'true'
description: 'Verbosity setting for the engine - true or false - default is false'
+ - string:
+ name: ARTIFACTS_TO_UPLOAD
+ default: "k8s-installer-ubuntu1804.bsx"
+ description: 'Artifacts to upload'
+ - string:
+ name: ARTIFACT_TO_DOWNLOAD
+ default: "k8s-installer-ubuntu1804.bsx"
+ description: 'Artifact to download'
- string:
name: NORDIX_ARM_PUBLIC_IP
default: '91.106.198.25'
- string:
name: NORDIX_ARM_PUBLIC_IP
default: '91.106.198.25'
@@
-96,10
+104,6
@@
name: NORDIX_ARM_REPO
default: 'nordix-kubernetes'
description: 'Name of the repository to upload and download artifact to/from. Depends on the stack'
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: NORDIX_ARTIFACT_URL
- default: "$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/change/$GERRIT_CHANGE_NUMBER/k8s-installer-ubuntu1804.bsx"
- description: 'Name of the repository to upload and download artifact to/from. Depends on the stack'
- string:
name: CI_LOOP
default: 'verify'
- string:
name: CI_LOOP
default: 'verify'
@@
-169,14
+173,18
@@
readable-message: 'true'
builders:
readable-message: 'true'
builders:
+ - 'wait-pkg-mgr-macro'
+ - 'generate-ssh-keypair-macro'
+ - 'generate-job-metadata-macro'
- multijob:
- multijob:
- name: packag
ing
+ name: packag
e
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
condition: SUCCESSFUL
execution-type: PARALLEL
projects:
- - name: 'engine-verify-packag
ing
-{distro}-{stream}'
+ - name: 'engine-verify-packag
e
-{distro}-{stream}'
current-parameters: true
node-parameters: true
current-parameters: true
node-parameters: true
+ property-file: "$WORKSPACE/build.properties"
kill-phase-on: FAILURE
abort-all-job: true
- multijob:
kill-phase-on: FAILURE
abort-all-job: true
- multijob:
@@
-197,8
+205,8
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
PROJECT=$GERRIT_PROJECT
BRANCH=$BRANCH
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
PROJECT=$GERRIT_PROJECT
BRANCH=$BRANCH
+ ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
- NORDIX_ARTIFACT_URL=$NORDIX_ARTIFACT_URL
EXECUTION_MODE=$EXECUTION_MODE
VERBOSITY=$VERBOSITY
DISTRO=$DISTRO
EXECUTION_MODE=$EXECUTION_MODE
VERBOSITY=$VERBOSITY
DISTRO=$DISTRO
@@
-206,6
+214,7
@@
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
PDF=$PDF
IDF=$IDF
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
PDF=$PDF
IDF=$IDF
+ property-file: "$WORKSPACE/build.properties"
kill-phase-on: FAILURE
abort-all-job: false
- name: 'engine-verify-{environment-type}-deploy-test-{distro}-city-cloud-master'
kill-phase-on: FAILURE
abort-all-job: false
- name: 'engine-verify-{environment-type}-deploy-test-{distro}-city-cloud-master'
@@
-221,8
+230,8
@@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
PROJECT=$GERRIT_PROJECT
BRANCH=$BRANCH
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
PROJECT=$GERRIT_PROJECT
BRANCH=$BRANCH
+ ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
- NORDIX_ARTIFACT_URL=$NORDIX_ARTIFACT_URL
EXECUTION_MODE=$EXECUTION_MODE
VERBOSITY=$VERBOSITY
DISTRO=$DISTRO
EXECUTION_MODE=$EXECUTION_MODE
VERBOSITY=$VERBOSITY
DISTRO=$DISTRO
@@
-230,11
+239,12
@@
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
PDF=$PDF
IDF=$IDF
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
PDF=$PDF
IDF=$IDF
+ property-file: "$WORKSPACE/build.properties"
kill-phase-on: FAILURE
abort-all-job: false
- job-template:
kill-phase-on: FAILURE
abort-all-job: false
- job-template:
- name: 'engine-verify-packag
ing
-{distro}-{stream}'
+ name: 'engine-verify-packag
e
-{distro}-{stream}'
disabled: '{obj:disabled}'
disabled: '{obj:disabled}'
@@
-267,7
+277,5
@@
clean_before: false
builders:
clean_before: false
builders:
- - 'engine-wait-pkg-mgr-macro'
- - 'engine-generate-ssh-keypair-macro'
- - 'engine-packaging-macro'
- - 'engine-upload-artifact-macro'
+ - 'package-macro'
+ - 'upload-artifact-macro'