diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-07 04:29:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-07 04:29:05 +0000 |
| commit | 2d1339b60efbc2afc79acedadfc0619af26ff882 (patch) | |
| tree | 2cfcaa12ab7d805536d34aa3c4c3b31ec9929499 | |
| parent | a0b15e40bbd3bcd70e5bf16958d48271b96381aa (diff) | |
| parent | e6036f52ed50c90e18c686267a400c1c633e3a88 (diff) | |
| download | kolla-2d1339b60efbc2afc79acedadfc0619af26ff882.tar.gz kolla-2d1339b60efbc2afc79acedadfc0619af26ff882.zip | |
Merge "Use separate publish jobs in periodic pipeline"
| -rw-r--r-- | .zuul.yaml | 94 | ||||
| -rw-r--r-- | tests/playbooks/publish.yml | 4 |
2 files changed, 61 insertions, 37 deletions
diff --git a/.zuul.yaml b/.zuul.yaml index 0755d0100..4153c9241 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -39,36 +39,12 @@ - kolla-build-oraclelinux-source periodic: jobs: - - kolla-build-centos-source: - vars: - publisher: true - secrets: - - kolla_dockerhub_creds - - kolla-build-centos-binary: - vars: - publisher: true - secrets: - - kolla_dockerhub_creds - - kolla-build-ubuntu-source: - vars: - publisher: true - secrets: - - kolla_dockerhub_creds - - kolla-build-ubuntu-binary: - vars: - publisher: true - secrets: - - kolla_dockerhub_creds - - kolla-build-oraclelinux-source: - vars: - publisher: true - secrets: - - kolla_dockerhub_creds - - kolla-build-oraclelinux-binary: - vars: - publisher: true - secrets: - - kolla_dockerhub_creds + - kolla-publish-centos-source + - kolla-publish-centos-binary + - kolla-publish-ubuntu-source + - kolla-publish-ubuntu-binary + - kolla-publish-oraclelinux-source + - kolla-publish-oraclelinux-binary - secret: name: kolla_dockerhub_creds @@ -114,9 +90,7 @@ timeout: 10200 pre-run: tests/playbooks/pre.yml run: tests/playbooks/run.yml - post-run: - - tests/playbooks/post.yml - - tests/playbooks/publish.yml + post-run: tests/playbooks/post.yml attempts: 1 required-projects: - openstack/kolla-ansible @@ -138,6 +112,15 @@ install_type: binary - job: + name: kolla-publish-centos-binary + parent: kolla-build-centos-binary + post-run: tests/playbooks/publish.yml + vars: + publisher: true + secrets: + - kolla_dockerhub_creds + +- job: name: kolla-build-centos-source parent: kolla-base nodeset: kolla-centos @@ -147,6 +130,15 @@ install_type: source - job: + name: kolla-publish-centos-source + parent: kolla-build-centos-source + post-run: tests/playbooks/publish.yml + vars: + publisher: true + secrets: + - kolla_dockerhub_creds + +- job: name: kolla-build-ubuntu-binary parent: kolla-base nodeset: kolla-ubuntu @@ -157,6 +149,15 @@ install_type: binary - job: + name: kolla-publish-ubuntu-binary + parent: kolla-build-ubuntu-binary + post-run: tests/playbooks/publish.yml + vars: + publisher: true + secrets: + - kolla_dockerhub_creds + +- job: name: kolla-build-ubuntu-source parent: kolla-base nodeset: kolla-ubuntu @@ -166,6 +167,15 @@ install_type: source - job: + name: kolla-publish-ubuntu-source + parent: kolla-build-ubuntu-source + post-run: tests/playbooks/publish.yml + vars: + publisher: true + secrets: + - kolla_dockerhub_creds + +- job: name: kolla-build-oraclelinux-binary parent: kolla-base nodeset: kolla-centos @@ -176,6 +186,15 @@ install_type: binary - job: + name: kolla-publish-oraclelinux-binary + parent: kolla-build-oraclelinux-binary + post-run: tests/playbooks/publish.yml + vars: + publisher: true + secrets: + - kolla_dockerhub_creds + +- job: name: kolla-build-oraclelinux-source parent: kolla-base nodeset: kolla-centos @@ -183,3 +202,12 @@ action: build base_distro: oraclelinux install_type: source + +- job: + name: kolla-publish-oraclelinux-source + parent: kolla-build-oraclelinux-source + post-run: tests/playbooks/publish.yml + vars: + publisher: true + secrets: + - kolla_dockerhub_creds diff --git a/tests/playbooks/publish.yml b/tests/playbooks/publish.yml index a72dffc79..9a019fac9 100644 --- a/tests/playbooks/publish.yml +++ b/tests/playbooks/publish.yml @@ -4,9 +4,5 @@ - name: Login to Dockerhub command: "docker login -u {{ kolla_dockerhub_creds.user }} -p {{ kolla_dockerhub_creds.password }}" no_log: true - when: - - publisher - shell: "for img in $(docker images --format '{% raw %}{{ .Repository }}:{{ .Tag }}{% endraw %}' | grep kolla ); do docker push $img; done" - when: - - publisher |