From bd8a71f0211d34102c22a4fffb43f087c5d406f6 Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Wed, 7 Dec 2016 16:34:32 +0100 Subject: [PATCH] Clone repositories for test-build jobs with zuul-cloner Change-Id: I9d4d447815c18f4691be5128d3c8202e853b5f22 Depends-On: I25c9709f73596324ec83d22b23dc8171fb90026f --- .../jobs/build-branch-job-template.yaml | 3 ++- jenkins-tp/jobs/builders/clone-with-zuul.sh | 20 +++++++++++++++++++ jenkins-tp/jobs/macros.yaml | 7 ++++++- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 jenkins-tp/jobs/builders/clone-with-zuul.sh diff --git a/jenkins-tp/jobs/build-branch-job-template.yaml b/jenkins-tp/jobs/build-branch-job-template.yaml index 1b81e14..6ff4874 100644 --- a/jenkins-tp/jobs/build-branch-job-template.yaml +++ b/jenkins-tp/jobs/build-branch-job-template.yaml @@ -4,7 +4,7 @@ - job-template: name: test-{os_version}-build-{name} builders: - - get-from-zuul-container + - zuul-clone - build-image-branch: name: '{name}' repos: '{repos}' @@ -15,6 +15,7 @@ node: standard wrappers: - ng-cleanup + - fuel-ccp-ci-jenkins triggers: - zuul properties: diff --git a/jenkins-tp/jobs/builders/clone-with-zuul.sh b/jenkins-tp/jobs/builders/clone-with-zuul.sh new file mode 100644 index 0000000..e5732d5 --- /dev/null +++ b/jenkins-tp/jobs/builders/clone-with-zuul.sh @@ -0,0 +1,20 @@ +#!/bin/bash -ex + +rep=`ssh -o StrictHostKeyChecking=no -p 29418 mirantis-fuel-ccp-ci@review.openstack.org gerrit ls-projects | grep "fuel-ccp-"| tr '\n' ' '` + +tee -a clonemap.yaml << EOF +clonemap: + - name: openstack/fuel-ccp + dest: fuel-ccp +EOF + +for f in ${rep}; do +tee -a clonemap.yaml << EOF + - name: ${f} + dest: containers/${f/fuel-ccp-/} +EOF +done + +source /home/jenkins/venv-zuul/bin/activate +zuul-cloner -m clonemap.yaml ssh://mirantis-fuel-ccp-ci@review.openstack.org:29418 openstack/fuel-ccp ${rep} +deactivate diff --git a/jenkins-tp/jobs/macros.yaml b/jenkins-tp/jobs/macros.yaml index 3b93264..d8755ca 100644 --- a/jenkins-tp/jobs/macros.yaml +++ b/jenkins-tp/jobs/macros.yaml @@ -63,7 +63,7 @@ wrappers: - ssh-agent-credentials: users: - - '77acc946-f346-4665-8271-c141b6ae9764' + - '623272f1-bc9a-4c75-93f3-b7ec6f242581' - wrapper: name: fuel-ccp-ci-docs @@ -125,6 +125,11 @@ builders: - shell: !include-raw: builders/build-image-branch.sh +- builder: + name: zuul-clone + builders: + - shell: !include-raw: builders/clone-with-zuul.sh + - builder: name: get-from-zuul-container builders: