From 747713beb3e604f561840c614e6930d443cd3304 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Mon, 25 Feb 2019 17:39:03 +0400 Subject: [PATCH] Create image build multijob Change-Id: Id86e31341ff6bcb377479a080725b906d40165d1 --- .../common/jobs/build-swarm-image.yaml | 6 ++ .../common/jobs/multijob-build-image.yaml | 59 +++++++++++++++++++ .../macroses/gerrit-review-last-refspec.yaml | 5 ++ .../scripts/build_base_swarm_slave_image.sh | 4 +- .../scripts/build_mos_swarm_slave_image.sh | 4 +- .../scripts/gerrit-review-last-refspec.sh | 11 ++++ 6 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 maintenance-ci/common/jobs/multijob-build-image.yaml create mode 100644 maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml create mode 100644 maintenance-ci/common/scripts/gerrit-review-last-refspec.sh diff --git a/maintenance-ci/common/jobs/build-swarm-image.yaml b/maintenance-ci/common/jobs/build-swarm-image.yaml index bb30210..7334d85 100644 --- a/maintenance-ci/common/jobs/build-swarm-image.yaml +++ b/maintenance-ci/common/jobs/build-swarm-image.yaml @@ -35,6 +35,12 @@ wrappers: - timestamps - openstack-creds + - credentials-binding: + - username-password-separated: + credential-id: maintenance-ci-robot-password + username: JJB_USER + password: JJB_PASS + - timeout: fail: true timeout: 30 diff --git a/maintenance-ci/common/jobs/multijob-build-image.yaml b/maintenance-ci/common/jobs/multijob-build-image.yaml new file mode 100644 index 0000000..0ef3b22 --- /dev/null +++ b/maintenance-ci/common/jobs/multijob-build-image.yaml @@ -0,0 +1,59 @@ +- job: + name: 'multijob-build-image' + description: | + Build image for future use + + concurrent: false + node: 'jenkins-master' + parameters: + - string: + name: BUILD_IMAGE_NAME + description: "Name of image to build - used for glance" + default: "maintenance-ci-base-image" + - string: + name: DEPLOY_IMAGE_NAME + description: "Name of image used for stack boot" + default: "maintenance-ci-base-image" + - bool: + name: TEST_AFTER_BUILD + default: "false" + - choice: + name: UPDATE_SCRIPT + choices: + - "maintenance-ci/common/scripts/build_base_swarm_slave_image.sh" + - "maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh" + - string: + name: CUSTOM_UPDATE_SCRIPT + description: "Overwrite UPDATE_SCRIPT if needed" + - string: + name: GERRIT_REVIEW + description: 'Number of gerrit review' + + + builders: + - trigger-builds: + - project: "deploy-heat-stack" + predefined-parameters: | + HEAT_STACK_YAML=maintenance-ci/common/data/jenkins-slave.yml + STACK_PREFIX=image-builder + FLAVOR_NAME=dev.cmn + JENKINS_LABELS=image_builder + IMAGE_NAME=${DEPLOY_IMAGE_NAME} + GERRIT_REVIEW=${GERRIT_REVIEW} + block: true + - trigger-builds: + - project: "build-swarm-image" + block: true + predefined-parameters: | + IMAGE_NAME=${BUILD_IMAGE_NAME} + GERRIT_REVIEW=${GERRIT_REVIEW} + TEST_AFTER_BUILD=${TEST_AFTER_BUILD} + UPDATE_SCRIPT=${UPDATE_SCRIPT} + CUSTOM_UPDATE_SCRIPT=${CUSTOM_UPDATE_SCRIPT} + - trigger-builds: + - project: "delete-heat-stack" + predefined-parameters: | + STACK_PREFIX=image-builder + block: true + + diff --git a/maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml b/maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml new file mode 100644 index 0000000..8d19ed6 --- /dev/null +++ b/maintenance-ci/common/macroses/gerrit-review-last-refspec.yaml @@ -0,0 +1,5 @@ +- builders: + name: gerrit-review-last-refspec + builders: + - shell: + !include-raw: common/scripts/gerrit-review-last-refspec.sh diff --git a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh index b350ddd..8c060ca 100644 --- a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh +++ b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh @@ -39,8 +39,8 @@ cat > /etc/jenkins-agent/config < /home/jenkins/launch_jenkins_agent.sh < /etc/jenkins-agent/config < /home/jenkins/launch_jenkins_agent.sh <