Use separate publish jobs in periodic pipeline

The secrets can not be inherited.

Change-Id: Ie0f99f470a419c57865eb8b0a14e465ae228c799
This commit is contained in:
Jeffrey Zhang 2017-12-06 13:51:40 +08:00 committed by Jeffrey Zhang
parent 628af2f8b0
commit e6036f52ed
2 changed files with 61 additions and 37 deletions

View File

@ -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
@ -137,6 +111,15 @@
base_distro: centos
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
@ -146,6 +129,15 @@
base_distro: centos
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
@ -156,6 +148,15 @@
base_distro: ubuntu
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
@ -165,6 +166,15 @@
base_distro: ubuntu
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
@ -175,6 +185,15 @@
base_distro: oraclelinux
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
@ -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

View File

@ -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