From d9c6cbc697c91976699f8bd4dea1a40b39ad430b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 26 Feb 2019 14:41:43 +0100 Subject: [PATCH] Use infra pipelines and roles Now that openstack-infra has new roles to build/upload/promote artifacts from gating, we are making use of them as much as we can. Mini-mirror was also changed: - It was wrongly affiliated to SUSE, so that Copyright line was removed. - The docker file was incorrectly named, and was therefore renamed for consistency. The LOCI jobs were not updated, and will be part of another commit. Change-Id: Ic37e634c52cb98e12568783ca6c7ac93e92ea2a7 --- ...erfile.ubuntu => Dockerfile.ubuntu_xenial} | 0 mini-mirror/build.sh | 2 +- zuul.d/base-jobs.yaml | 20 ---- zuul.d/base-project.yaml | 4 - zuul.d/base.yaml | 93 +++++++++++++++++++ zuul.d/ceph-config-helper.yaml | 88 +++++++----------- zuul.d/ceph-daemon.yaml | 50 ++++++---- zuul.d/ceph-utility.yaml | 50 ++++++---- zuul.d/gate-utils.yaml | 88 +++++++----------- zuul.d/libvirt.yaml | 89 +++++++----------- zuul.d/mariadb.yaml | 59 ++++++------ zuul.d/mini-mirror.yaml | 48 +++++++--- zuul.d/openstack-loci.yaml | 37 +++----- zuul.d/openvswitch.yaml | 88 +++++++----------- zuul.d/secrets.yaml | 25 ----- zuul.d/tempest.yaml | 59 ++++++------ zuul.d/vbmc.yaml | 85 +++++++---------- 17 files changed, 436 insertions(+), 449 deletions(-) rename mini-mirror/{Dockerfile.ubuntu => Dockerfile.ubuntu_xenial} (100%) delete mode 100644 zuul.d/base-jobs.yaml delete mode 100644 zuul.d/base-project.yaml create mode 100644 zuul.d/base.yaml delete mode 100644 zuul.d/secrets.yaml diff --git a/mini-mirror/Dockerfile.ubuntu b/mini-mirror/Dockerfile.ubuntu_xenial similarity index 100% rename from mini-mirror/Dockerfile.ubuntu rename to mini-mirror/Dockerfile.ubuntu_xenial diff --git a/mini-mirror/build.sh b/mini-mirror/build.sh index 8c44a663..e3949e04 100755 --- a/mini-mirror/build.sh +++ b/mini-mirror/build.sh @@ -22,7 +22,7 @@ cd "${SCRIPT_DIR}"/.. || exit IMAGE="mini-mirror" VERSION=${VERSION:-latest} -DISTRO=${DISTRO:-ubuntu} +DISTRO=${DISTRO:-ubuntu_xenial} REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} diff --git a/zuul.d/base-jobs.yaml b/zuul.d/base-jobs.yaml deleted file mode 100644 index f86941ba..00000000 --- a/zuul.d/base-jobs.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- job: - name: openstack-helm-images-base - parent: base - abstract: true - description: | - This job is building a docker image for - OpenStack-Helm usage. - Image specific tests can be added by - running a post script on the relevant - jobs. - irrelevant-files: - - ^\.git.* - - ^.*\.(example|md|rst)$ - - ^doc/.* - - ^releasenotes/.* - timeout: 3600 - pre-run: - - zuul.d/playbooks/pre-run.yml - run: zuul.d/playbooks/docker-build.yml - nodeset: ubuntu-bionic diff --git a/zuul.d/base-project.yaml b/zuul.d/base-project.yaml deleted file mode 100644 index e2d5cc12..00000000 --- a/zuul.d/base-project.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- project: - templates: - - publish-openstack-docs-pti - - release-notes-jobs-python3 diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml new file mode 100644 index 00000000..7351536a --- /dev/null +++ b/zuul.d/base.yaml @@ -0,0 +1,93 @@ +--- +# Copyright 2019, SUSE LINUX GmbH. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- project: + templates: + - publish-openstack-docs-pti + - release-notes-jobs-python3 + +# This takes the same structure as other infra jobs. +# This dict keyname matter. See also job definition for more explanations. +- secret: + name: openstack-helm-dockerhub + data: + username: !encrypted/pkcs1-oaep + - ElBadZeuRFwbxgDHz+TOCdpaqHMAAA0E2WYnplrREC3ndO25CB0zmoBUaYMHObnykM1Yv + K/bcfWtlcj8Ucz/U8KIDPBVED7T4OqhhUeIIc+8cw5QuQ9now0ltk8S0/fdJ0qHmNypz9 + lnbhE0Ir7NPWCSHRIE61BasVcem5QPMre9rNy91rCby8r0+onHlyArRAIoxF3V5Y6DazC + DeUDw8fIYZsIfMa5/uuGLf1PW4xCyLhiOiZ0Sr0e454l68tjGGniPpYGIxnjAMKy+hwSb + dTX+wc+GP7/7XJnQJ3JcGKt5fYrGgkdzljUeMndfMuKq5WBXkH1EaT6YWJ6V7qAzQk3WN + 0QHNO80Wa4Uu8Yyyeh9HFXut5VCKLQGOObG8t7Rw75Yf4TXKdFCQKRZ/ecV7KSGFNWh5i + 4zvgxCwIcv06TX14PcqUJAC8WAWbtUXWhmVgVSPA1B8DU9o8sBVH5CqwgMg32gzQwrDdN + 8hf3ErWSPVIqtpLZ3SgsnvgUl3W43wwafxp5pMcFEvZS2iG6Ty89BukzEu/xYNEwaS/ys + nvpe+El8VBXuB2ZlgwOXyEzgSdzInibTQsLdCyHGWJ1jy+m0R48GjllCCggjAUzqL9o7e + jPPb8mfq+jHs9LJVJLYI5tRVYEd4GxoK/1c1LO5v9ixeyKj3PWWBHv54gJ6F74= + password: !encrypted/pkcs1-oaep + - OWlZwPHSDB5+E0dDwR9cfRpeoODFtOm6L1VztzvQYShQNce6i0iLHpJ6dUyk1HXSFG53t + hOQ++q5DHpqV8SCZIYgmcDGrw+EhIlYBINxNL94MlkPNz6YYaemAATdP1kzFmCjlQBRB5 + z2CyrTs0gTdOjAKdP1GEBQPKdllt0iw0px3il2ux5fNM2WZuc5Vs0mOXa4+OFioUMCUn7 + KBlSzuVkhYCynvZb/cKDUqsNAuu6RINv/J/OmYbSw0aUxmDHtJ//U8lFHA8YBNUVInQZV + HidTyJxBEVLrqqwQPESV1ZB1K0ydeq2rYq5ebrfnl4TyYAOH/Tegg36Tlc8dPebddPaOk + 38+9KJ25xWpVvFs/83MYxxEdLiUztv3FyxE51yd6gDZ4146l8Vc89VLdi35ce4TVsys0A + 80yfr/mi6U0xIEzhoxqaDPpAE65lQ1zFdz7/10JiZiwlgEKrzjiAKy7gYbdfnWhBz0YaA + U+qKRpWX2r+mOrsyBC6TR3fkCofai11VuL3wwJm37wNteUN9WXTWB61CoDKmuMISKwCxf + zP68/8zIekxwRuqKM9aQrqmPg7TEX/GEj7hpUTW/OO6wPktkHX+I6e+FtNTtL33TNRAbh + /MlQspgCDU2QL/2JvfkXxOwxEe143a8vEn6NMyRuQM7gpIB6yeK29bCgXcH3x8= + +# In docker_images: +# `context` is the folder in osh-images +# `repository` is the repo on dockerhub +# `tags` is a list of the tags when promoted +# (images are published with change id) +# `dockerfile`. Explicit. +- job: + name: openstack-helm-images-build + parent: build-docker-image + abstract: true + description: | + This job is building a docker image for + OpenStack-Helm usage. + Image specific tests can be added by + running a post script on the relevant + jobs. + irrelevant-files: + - ^\.git.* + - ^.*\.(example|md|rst)$ + - ^doc/.* + - ^releasenotes/.* + timeout: 3600 + +# The secret openstack-helm-dockerhub is exposed as docker_credentials dict, +# which is used by upload-docker-image job to pass those vars to the +# upload role. +- job: + name: openstack-helm-images-upload + parent: upload-docker-image + abstract: true + secrets: + name: docker_credentials + secret: openstack-helm-dockerhub + pass-to-parent: true + timeout: 3600 + +- job: + name: openstack-helm-images-promote + parent: promote-docker-image + abstract: true + secrets: + name: docker_credentials + secret: openstack-helm-dockerhub + pass-to-parent: true + timeout: 3600 diff --git a/zuul.d/ceph-config-helper.yaml b/zuul.d/ceph-config-helper.yaml index f657ee37..ee6ca3c4 100644 --- a/zuul.d/ceph-config-helper.yaml +++ b/zuul.d/ceph-config-helper.yaml @@ -1,5 +1,5 @@ --- -# Copyright 2018, SUSE LINUX GmbH. +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,67 +16,47 @@ - project: check: jobs: - - openstack-helm-images-ceph-config-helper-suse_15: - files: &ceph-suse15-files - - ^ceph-config-helper/build.sh - - ^ceph-config-helper/Dockerfile.suse_15$ - - ^zuul.d/ceph-config-helper.yaml - - openstack-helm-images-ceph-config-helper-ubuntu_xenial: - files: &ceph-ubuntuxenial-files - - ^ceph-config-helper/build.sh - - ^ceph-config-helper/Dockerfile.ubuntu_xenial$ - - ^zuul.d/ceph-config-helper.yaml + - openstack-helm-images-build-ceph-config-helper gate: jobs: - - openstack-helm-images-ceph-config-helper-suse_15: - files: *ceph-suse15-files - - openstack-helm-images-ceph-config-helper-ubuntu_xenial: - files: *ceph-ubuntuxenial-files - post: + - openstack-helm-images-upload-ceph-config-helper + promote: jobs: - - publish-openstack-helm-images-ceph-config-helper-suse_15: - files: *ceph-suse15-files - - publish-openstack-helm-images-ceph-config-helper-ubuntu_xenial: - files: *ceph-ubuntuxenial-files + - openstack-helm-images-promote-ceph-config-helper periodic: jobs: - - openstack-helm-images-ceph-config-helper-suse_15 - - openstack-helm-images-ceph-config-helper-ubuntu_xenial - #experimental: - # jobs: - # - openstack-helm-infra-five-ubuntu + - openstack-helm-images-build-ceph-config-helper - job: - name: openstack-helm-images-ceph-config-helper - parent: openstack-helm-images-base - abstract: true - vars: - image_path: ceph-config-helper + name: openstack-helm-images-build-ceph-config-helper + parent: openstack-helm-images-build + description: Build ceph-config-helper images + vars: &ceph-config-helper_vars + docker_images: + - context: ceph-config-helper + repository: openstackhelm/ceph-config-helper + tags: + - opensuse_15-latest + dockerfile: Dockerfile.suse_15 + - context: ceph-config-helper + repository: openstackhelm/ceph-config-helper + dockerfile: Dockerfile.ubuntu_xenial + tags: + - ubuntu_xenial-latest + files: &ceph-config-helper_files + - ceph-config-helper/.* + - zuul.d/ceph-config-helper.yaml - job: - name: openstack-helm-images-ceph-config-helper-suse_15 - parent: openstack-helm-images-ceph-config-helper - vars: - distro: "suse_15" + name: openstack-helm-images-upload-ceph-config-helper + parent: openstack-helm-images-upload + description: Build and upload ceph-config-helper images + vars: *ceph-config-helper_vars + files: *ceph-config-helper_files - job: - name: openstack-helm-images-ceph-config-helper-ubuntu_xenial - parent: openstack-helm-images-ceph-config-helper - vars: - distro: "ubuntu_xenial" - -- job: - name: publish-openstack-helm-images-ceph-config-helper-suse_15 - parent: openstack-helm-images-ceph-config-helper-suse_15 - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials - -- job: - name: publish-openstack-helm-images-ceph-config-helper-ubuntu_xenial - parent: openstack-helm-images-ceph-config-helper-ubuntu_xenial - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials + name: openstack-helm-images-promote-ceph-config-helper + parent: openstack-helm-images-promote + description: Promote a previously published ceph-config-helper image to latest. + vars: *ceph-config-helper_vars + files: *ceph-config-helper_files diff --git a/zuul.d/ceph-daemon.yaml b/zuul.d/ceph-daemon.yaml index 488016c0..1835a248 100644 --- a/zuul.d/ceph-daemon.yaml +++ b/zuul.d/ceph-daemon.yaml @@ -1,4 +1,6 @@ --- +# Copyright 2019, SUSE LINUX GmbH. +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,28 +16,42 @@ - project: check: jobs: - - openstack-helm-images-ceph-daemon-ubuntu_xenial: - files: &ceph-ubuntuxenial-files - - ^ceph-daemon/build.sh - - ^ceph-daemon/Dockerfile.ubuntu_xenial$ - - ^zuul.d/ceph-daemon.yaml + - openstack-helm-images-build-ceph-daemon gate: jobs: - - openstack-helm-images-ceph-daemon-ubuntu_xenial: - files: *ceph-ubuntuxenial-files + - openstack-helm-images-upload-ceph-daemon + promote: + jobs: + - openstack-helm-images-promote-ceph-daemon periodic: jobs: - - openstack-helm-images-ceph-daemon-ubuntu_xenial + - openstack-helm-images-build-ceph-daemon - job: - name: openstack-helm-images-ceph-daemon - parent: openstack-helm-images-base - abstract: true - vars: - image_path: ceph-daemon + name: openstack-helm-images-build-ceph-daemon + parent: openstack-helm-images-build + description: Build ceph-daemon images + vars: &ceph-daemon_vars + docker_images: + - context: ceph-daemon + repository: openstackhelm/ceph-daemon + dockerfile: Dockerfile.ubuntu_xenial + tags: + - ubuntu_xenial-latest + files: &ceph-daemon_files + - ceph-daemon/.* + - zuul.d/ceph-daemon.yaml - job: - name: openstack-helm-images-ceph-daemon-ubuntu_xenial - parent: openstack-helm-images-ceph-daemon - vars: - distro: "ubuntu_xenial" + name: openstack-helm-images-upload-ceph-daemon + parent: openstack-helm-images-upload + description: Build and upload ceph-daemon images + vars: *ceph-daemon_vars + files: *ceph-daemon_files + +- job: + name: openstack-helm-images-promote-ceph-daemon + parent: openstack-helm-images-promote + description: Promote a previously published ceph-daemon image to latest. + vars: *ceph-daemon_vars + files: *ceph-daemon_files diff --git a/zuul.d/ceph-utility.yaml b/zuul.d/ceph-utility.yaml index 6b76b528..ca1f7506 100644 --- a/zuul.d/ceph-utility.yaml +++ b/zuul.d/ceph-utility.yaml @@ -1,4 +1,6 @@ --- +# Copyright 2019, SUSE LINUX GmbH. +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -14,28 +16,42 @@ - project: check: jobs: - - openstack-helm-images-ceph-utility-ubuntu_xenial: - files: &ceph-ubuntuxenial-files - - ^ceph-utility/build.sh - - ^ceph-utility/Dockerfile.ubuntu_xenial$ - - ^zuul.d/ceph-utility.yaml + - openstack-helm-images-build-ceph-utility gate: jobs: - - openstack-helm-images-ceph-utility-ubuntu_xenial: - files: *ceph-ubuntuxenial-files + - openstack-helm-images-upload-ceph-utility + promote: + jobs: + - openstack-helm-images-promote-ceph-utility periodic: jobs: - - openstack-helm-images-ceph-utility-ubuntu_xenial + - openstack-helm-images-build-ceph-utility - job: - name: openstack-helm-images-ceph-utility - parent: openstack-helm-images-base - abstract: true - vars: - image_path: ceph-utility + name: openstack-helm-images-build-ceph-utility + parent: openstack-helm-images-build + description: Build ceph-utility images + vars: &ceph-utility_vars + docker_images: + - context: ceph-utility + repository: openstackhelm/ceph-utility + dockerfile: Dockerfile.ubuntu_xenial + tags: + - ubuntu_xenial-latest + files: &ceph-utility_files + - ceph-utility/.* + - zuul.d/ceph-utility.yaml - job: - name: openstack-helm-images-ceph-utility-ubuntu_xenial - parent: openstack-helm-images-ceph-utility - vars: - distro: "ubuntu_xenial" + name: openstack-helm-images-upload-ceph-utility + parent: openstack-helm-images-upload + description: Build and upload ceph-utility images + vars: *ceph-utility_vars + files: *ceph-utility_files + +- job: + name: openstack-helm-images-promote-ceph-utility + parent: openstack-helm-images-promote + description: Promote a previously published ceph-utility image to latest. + vars: *ceph-utility_vars + files: *ceph-utility_files diff --git a/zuul.d/gate-utils.yaml b/zuul.d/gate-utils.yaml index 1d9a9859..521a0d3f 100644 --- a/zuul.d/gate-utils.yaml +++ b/zuul.d/gate-utils.yaml @@ -1,5 +1,5 @@ --- -# Copyright 2018, SUSE LINUX GmbH. +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,67 +16,47 @@ - project: check: jobs: - - openstack-helm-images-gate-utils-debian: - files: &gate-debian-files - - ^gate-utils/build.sh - - ^gate-utils/Dockerfile.debian$ - - ^zuul.d/gate-utils.yaml - - openstack-helm-images-gate-utils-suse_15: - files: &gate-suse15-files - - ^gate-utils/build.sh - - ^gate-utils/Dockerfile.suse_15$ - - ^zuul.d/gate-utils.yaml + - openstack-helm-images-build-gate-utils gate: jobs: - - openstack-helm-images-gate-utils-debian: - files: *gate-debian-files - - openstack-helm-images-gate-utils-suse_15: - files: *gate-suse15-files - post: + - openstack-helm-images-upload-gate-utils + promote: jobs: - - publish-openstack-helm-images-gate-utils-debian: - files: *gate-debian-files - - publish-openstack-helm-images-gate-utils-suse_15: - files: *gate-suse15-files + - openstack-helm-images-promote-gate-utils periodic: jobs: - - openstack-helm-images-gate-utils-debian - - openstack-helm-images-gate-utils-suse_15 - #experimental: - # jobs: - # - openstack-helm-infra-five-ubuntu + - openstack-helm-images-build-gate-utils - job: - name: openstack-helm-images-gate-utils - parent: openstack-helm-images-base - abstract: true - vars: - image_path: gate-utils + name: openstack-helm-images-build-gate-utils + parent: openstack-helm-images-build + description: Build gate-utils images + vars: &gate-utils_vars + docker_images: + - context: gate-utils + repository: openstackhelm/gate-utils + tags: + - opensuse_15-latest + dockerfile: Dockerfile.suse_15 + - context: gate-utils + repository: openstackhelm/gate-utils + dockerfile: Dockerfile.debian + tags: + - debian-latest + files: &gate-utils_files + - gate-utils/.* + - zuul.d/gate-utils.yaml - job: - name: openstack-helm-images-gate-utils-debian - parent: openstack-helm-images-gate-utils - vars: - distro: "debian" + name: openstack-helm-images-upload-gate-utils + parent: openstack-helm-images-upload + description: Build and upload gate-utils images + vars: *gate-utils_vars + files: *gate-utils_files - job: - name: openstack-helm-images-gate-utils-suse_15 - parent: openstack-helm-images-gate-utils - vars: - distro: "suse_15" - -- job: - name: publish-openstack-helm-images-gate-utils-debian - parent: openstack-helm-images-gate-utils-debian - post-review: true - post-run: zuul.d/playbooks/publish.yml - secrets: - - openstack_helm_images_publish_credentials - -- job: - name: publish-openstack-helm-images-gate-utils-suse_15 - parent: openstack-helm-images-gate-utils-suse_15 - post-review: true - post-run: zuul.d/playbooks/publish.yml - secrets: - - openstack_helm_images_publish_credentials + name: openstack-helm-images-promote-gate-utils + parent: openstack-helm-images-promote + description: Promote a previously published gate-utils image to latest. + vars: *gate-utils_vars + files: *gate-utils_files diff --git a/zuul.d/libvirt.yaml b/zuul.d/libvirt.yaml index f5878220..39fd8fd8 100644 --- a/zuul.d/libvirt.yaml +++ b/zuul.d/libvirt.yaml @@ -1,5 +1,5 @@ --- -# Copyright 2018, SUSE LINUX GmbH. +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,68 +16,47 @@ - project: check: jobs: - - openstack-helm-images-libvirt-suse_15: - files: &libvirt-suse15-files - - ^libvirt/build.sh - - ^libvirt/Dockerfile.suse_15$ - - ^libvirt/suse_.*$ - - ^zuul.d/libvirt.yaml - - openstack-helm-images-libvirt-ubuntu_xenial: - files: &libvirt-ubuntuxenial-files - - ^libvirt/build.sh - - ^libvirt/Dockerfile.ubuntu_xenial$ - - ^zuul.d/libvirt.yaml + - openstack-helm-images-build-libvirt gate: jobs: - - openstack-helm-images-libvirt-suse_15: - files: *libvirt-suse15-files - - openstack-helm-images-libvirt-ubuntu_xenial: - files: *libvirt-ubuntuxenial-files - post: + - openstack-helm-images-upload-libvirt + promote: jobs: - - publish-openstack-helm-images-libvirt-suse_15: - files: *libvirt-suse15-files - - publish-openstack-helm-images-libvirt-ubuntu_xenial: - files: *libvirt-ubuntuxenial-files + - openstack-helm-images-promote-libvirt periodic: jobs: - - openstack-helm-images-libvirt-suse_15 - - openstack-helm-images-libvirt-ubuntu_xenial - #experimental: - # jobs: - # - openstack-helm-infra-five-ubuntu + - openstack-helm-images-build-libvirt - job: - name: openstack-helm-images-libvirt - parent: openstack-helm-images-base - abstract: true - vars: - image_path: libvirt + name: openstack-helm-images-build-libvirt + parent: openstack-helm-images-build + description: Build libvirt images + vars: &libvirt_vars + docker_images: + - context: libvirt + repository: openstackhelm/libvirt + tags: + - opensuse_15-latest + dockerfile: Dockerfile.suse_15 + - context: libvirt + repository: openstackhelm/libvirt + dockerfile: Dockerfile.ubuntu_xenial + tags: + - ubuntu_xenial-latest + files: &libvirt_files + - libvirt/.* + - zuul.d/libvirt.yaml - job: - name: openstack-helm-images-libvirt-suse_15 - parent: openstack-helm-images-libvirt - vars: - distro: "suse_15" + name: openstack-helm-images-upload-libvirt + parent: openstack-helm-images-upload + description: Build and upload libvirt images + vars: *libvirt_vars + files: *libvirt_files - job: - name: openstack-helm-images-libvirt-ubuntu_xenial - parent: openstack-helm-images-libvirt - vars: - distro: "ubuntu_xenial" - -- job: - name: publish-openstack-helm-images-libvirt-ubuntu_xenial - parent: openstack-helm-images-libvirt-ubuntu_xenial - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials - -- job: - name: publish-openstack-helm-images-libvirt-suse_15 - parent: openstack-helm-images-libvirt-suse_15 - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials + name: openstack-helm-images-promote-libvirt + parent: openstack-helm-images-promote + description: Promote a previously published libvirt image to latest. + vars: *libvirt_vars + files: *libvirt_files diff --git a/zuul.d/mariadb.yaml b/zuul.d/mariadb.yaml index 2fbdfc05..63021341 100644 --- a/zuul.d/mariadb.yaml +++ b/zuul.d/mariadb.yaml @@ -1,5 +1,5 @@ --- -# Copyright 2018, SUSE LINUX GmbH. +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,43 +16,42 @@ - project: check: jobs: - - openstack-helm-images-mariadb-ubuntu_xenial: - files: &mariadb-ubuntuxenial-files - - ^mariadb/build.sh - - ^mariadb/Dockerfile.ubuntu_xenial$ - - ^zuul.d/mariadb.yaml + - openstack-helm-images-build-mariadb gate: jobs: - - openstack-helm-images-mariadb-ubuntu_xenial: - files: *mariadb-ubuntuxenial-files - post: + - openstack-helm-images-upload-mariadb + promote: jobs: - - publish-openstack-helm-images-mariadb-ubuntu_xenial: - files: *mariadb-ubuntuxenial-files + - openstack-helm-images-promote-mariadb periodic: jobs: - - openstack-helm-images-mariadb-ubuntu_xenial - #experimental: - # jobs: - # - openstack-helm-infra-five-ubuntu + - openstack-helm-images-build-mariadb - job: - name: openstack-helm-images-mariadb - parent: openstack-helm-images-base - abstract: true - vars: - image_path: mariadb + name: openstack-helm-images-build-mariadb + parent: openstack-helm-images-build + description: Build mariadb images + vars: &mariadb_vars + docker_images: + - context: mariadb + repository: openstackhelm/mariadb + dockerfile: Dockerfile.ubuntu_xenial + tags: + - ubuntu_xenial-latest + files: &mariadb_files + - mariadb/.* + - zuul.d/mariadb.yaml - job: - name: openstack-helm-images-mariadb-ubuntu_xenial - parent: openstack-helm-images-mariadb - vars: - distro: "ubuntu_xenial" + name: openstack-helm-images-upload-mariadb + parent: openstack-helm-images-upload + description: Build and upload mariadb images + vars: *mariadb_vars + files: *mariadb_files - job: - name: publish-openstack-helm-images-mariadb-ubuntu_xenial - parent: openstack-helm-images-mariadb-ubuntu_xenial - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials + name: openstack-helm-images-promote-mariadb + parent: openstack-helm-images-promote + description: Promote a previously published mariadb image to latest. + vars: *mariadb_vars + files: *mariadb_files diff --git a/zuul.d/mini-mirror.yaml b/zuul.d/mini-mirror.yaml index 8f63e834..ea1a6e70 100644 --- a/zuul.d/mini-mirror.yaml +++ b/zuul.d/mini-mirror.yaml @@ -1,6 +1,6 @@ --- -# Copyright 2018, SUSE LINUX GmbH. # Copyright 2019, AT&T Intellectual Property +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,22 +17,42 @@ - project: check: jobs: - - openstack-helm-images-mini-mirror-ubuntu_xenial + - openstack-helm-images-build-mini-mirror gate: jobs: - - openstack-helm-images-mini-mirror-ubuntu_xenial + - openstack-helm-images-upload-mini-mirror + promote: + jobs: + - openstack-helm-images-promote-mini-mirror periodic: jobs: - - openstack-helm-images-mini-mirror-ubuntu_xenial -- job: - name: openstack-helm-images-mini-mirror - parent: openstack-helm-images-base - abstract: true - vars: - image_path: mini-mirror + - openstack-helm-images-build-mini-mirror - job: - name: openstack-helm-images-mini-mirror-ubuntu_xenial - parent: openstack-helm-images-mini-mirror - vars: - distro: "ubuntu" + name: openstack-helm-images-build-mini-mirror + parent: openstack-helm-images-build + description: Build mini-mirror images + vars: &mini-mirror_vars + docker_images: + - context: mini-mirror + repository: openstackhelm/mini-mirror + dockerfile: Dockerfile.ubuntu_xenial + tags: + - ubuntu_xenial-latest + files: &mini-mirror_files + - mini-mirror/.* + - zuul.d/mini-mirror.yaml + +- job: + name: openstack-helm-images-upload-mini-mirror + parent: openstack-helm-images-upload + description: Build and upload mini-mirror images + vars: *mini-mirror_vars + files: *mini-mirror_files + +- job: + name: openstack-helm-images-promote-mini-mirror + parent: openstack-helm-images-promote + description: Promote a previously published mini-mirror image to latest. + vars: *mini-mirror_vars + files: *mini-mirror_files diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml index 6ba28fe2..9833bb13 100644 --- a/zuul.d/openstack-loci.yaml +++ b/zuul.d/openstack-loci.yaml @@ -18,48 +18,39 @@ jobs: - openstack-helm-images-openstack-loci-newton-ubuntu_xenial: voting: false - files: &loci-files - - ^openstack/loci/.* - - zuul.d/openstack-loci.yaml - - openstack-helm-images-openstack-loci-ocata-ubuntu_xenial: - files: *loci-files - - openstack-helm-images-openstack-loci-pike-ubuntu_xenial: - files: *loci-files - - openstack-helm-images-openstack-loci-queens-suse_15: - files: *loci-files - - openstack-helm-images-openstack-loci-queens-ubuntu_xenial: - files: *loci-files + - openstack-helm-images-openstack-loci-ocata-ubuntu_xenial + - openstack-helm-images-openstack-loci-pike-ubuntu_xenial + - openstack-helm-images-openstack-loci-queens-suse_15 + - openstack-helm-images-openstack-loci-queens-ubuntu_xenial gate: jobs: - - openstack-helm-images-openstack-loci-ocata-ubuntu_xenial: - files: *loci-files - - openstack-helm-images-openstack-loci-pike-ubuntu_xenial: - files: *loci-files - - openstack-helm-images-openstack-loci-queens-suse_15: - files: *loci-files - - openstack-helm-images-openstack-loci-queens-ubuntu_xenial: - files: *loci-files + - openstack-helm-images-openstack-loci-ocata-ubuntu_xenial + - openstack-helm-images-openstack-loci-pike-ubuntu_xenial + - openstack-helm-images-openstack-loci-queens-suse_15 + - openstack-helm-images-openstack-loci-queens-ubuntu_xenial periodic: jobs: - openstack-helm-images-openstack-loci-ocata-ubuntu_xenial - openstack-helm-images-openstack-loci-pike-ubuntu_xenial - openstack-helm-images-openstack-loci-queens-suse_15 - openstack-helm-images-openstack-loci-queens-ubuntu_xenial - #experimental: - # jobs: - # - openstack-helm-infra-five-ubuntu - job: name: openstack-helm-images-openstack-loci - parent: openstack-helm-images-base + parent: base abstract: true vars: use_tmpfs: False required-projects: - name: openstack/loci pre-run: + - zuul.d/playbooks/pre-run.yml - zuul.d/playbooks/pre-loci-build.yml run: zuul.d/playbooks/loci-build.yml + timeout: 3600 + files: &loci-files + - ^openstack/loci/.* + - zuul.d/openstack-loci.yaml - job: name: openstack-helm-images-openstack-loci-newton diff --git a/zuul.d/openvswitch.yaml b/zuul.d/openvswitch.yaml index 1b7391ed..77eb454a 100644 --- a/zuul.d/openvswitch.yaml +++ b/zuul.d/openvswitch.yaml @@ -1,5 +1,5 @@ --- -# Copyright 2018, SUSE LINUX GmbH. +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,67 +16,47 @@ - project: check: jobs: - - openstack-helm-images-openvswitch-debian: - files: &ovs-debian-files - - ^openvswitch/build.sh - - ^openvswitch/Dockerfile.debian$ - - ^zuul.d/openvswitch.yaml - - openstack-helm-images-openvswitch-suse_15: - files: &ovs-suse15-files - - ^openvswitch/build.sh - - ^openvswitch/Dockerfile.suse_15$ - - ^zuul.d/openvswitch.yaml + - openstack-helm-images-build-openvswitch gate: jobs: - - openstack-helm-images-openvswitch-debian: - files: *ovs-debian-files - - openstack-helm-images-openvswitch-suse_15: - files: *ovs-suse15-files - post: + - openstack-helm-images-upload-openvswitch + promote: jobs: - - publish-openstack-helm-images-openvswitch-debian: - files: *ovs-debian-files - - publish-openstack-helm-images-openvswitch-suse_15: - files: *ovs-suse15-files + - openstack-helm-images-promote-openvswitch periodic: jobs: - - openstack-helm-images-openvswitch-debian - - openstack-helm-images-openvswitch-suse_15 - #experimental: - # jobs: - # - openstack-helm-infra-five-ubuntu + - openstack-helm-images-build-openvswitch - job: - name: openstack-helm-images-openvswitch - parent: openstack-helm-images-base - abstract: true - vars: - image_path: openvswitch + name: openstack-helm-images-build-openvswitch + parent: openstack-helm-images-build + description: Build openvswitch images + vars: &openvswitch_vars + docker_images: + - context: openvswitch + repository: openstackhelm/openvswitch + tags: + - opensuse_15-latest + dockerfile: Dockerfile.suse_15 + - context: openvswitch + repository: openstackhelm/openvswitch + dockerfile: Dockerfile.debian + tags: + - debian-latest + files: &openvswitch_files + - openvswitch/.* + - zuul.d/openvswitch.yaml - job: - name: openstack-helm-images-openvswitch-debian - parent: openstack-helm-images-openvswitch - vars: - distro: "debian" + name: openstack-helm-images-upload-openvswitch + parent: openstack-helm-images-upload + description: Build and upload openvswitch images + vars: *openvswitch_vars + files: *openvswitch_files - job: - name: openstack-helm-images-openvswitch-suse_15 - parent: openstack-helm-images-openvswitch - vars: - distro: "suse_15" - -- job: - name: publish-openstack-helm-images-openvswitch-debian - parent: openstack-helm-images-openvswitch-debian - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials - -- job: - name: publish-openstack-helm-images-openvswitch-suse_15 - parent: openstack-helm-images-openvswitch-suse_15 - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials + name: openstack-helm-images-promote-openvswitch + parent: openstack-helm-images-promote + description: Promote a previously published openvswitch image to latest. + vars: *openvswitch_vars + files: *openvswitch_files diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml deleted file mode 100644 index 9d77bc72..00000000 --- a/zuul.d/secrets.yaml +++ /dev/null @@ -1,25 +0,0 @@ -- secret: - name: openstack_helm_images_publish_credentials - data: - dockerhub_user: !encrypted/pkcs1-oaep - - ElBadZeuRFwbxgDHz+TOCdpaqHMAAA0E2WYnplrREC3ndO25CB0zmoBUaYMHObnykM1Yv - K/bcfWtlcj8Ucz/U8KIDPBVED7T4OqhhUeIIc+8cw5QuQ9now0ltk8S0/fdJ0qHmNypz9 - lnbhE0Ir7NPWCSHRIE61BasVcem5QPMre9rNy91rCby8r0+onHlyArRAIoxF3V5Y6DazC - DeUDw8fIYZsIfMa5/uuGLf1PW4xCyLhiOiZ0Sr0e454l68tjGGniPpYGIxnjAMKy+hwSb - dTX+wc+GP7/7XJnQJ3JcGKt5fYrGgkdzljUeMndfMuKq5WBXkH1EaT6YWJ6V7qAzQk3WN - 0QHNO80Wa4Uu8Yyyeh9HFXut5VCKLQGOObG8t7Rw75Yf4TXKdFCQKRZ/ecV7KSGFNWh5i - 4zvgxCwIcv06TX14PcqUJAC8WAWbtUXWhmVgVSPA1B8DU9o8sBVH5CqwgMg32gzQwrDdN - 8hf3ErWSPVIqtpLZ3SgsnvgUl3W43wwafxp5pMcFEvZS2iG6Ty89BukzEu/xYNEwaS/ys - nvpe+El8VBXuB2ZlgwOXyEzgSdzInibTQsLdCyHGWJ1jy+m0R48GjllCCggjAUzqL9o7e - jPPb8mfq+jHs9LJVJLYI5tRVYEd4GxoK/1c1LO5v9ixeyKj3PWWBHv54gJ6F74= - dockerhub_password: !encrypted/pkcs1-oaep - - OWlZwPHSDB5+E0dDwR9cfRpeoODFtOm6L1VztzvQYShQNce6i0iLHpJ6dUyk1HXSFG53t - hOQ++q5DHpqV8SCZIYgmcDGrw+EhIlYBINxNL94MlkPNz6YYaemAATdP1kzFmCjlQBRB5 - z2CyrTs0gTdOjAKdP1GEBQPKdllt0iw0px3il2ux5fNM2WZuc5Vs0mOXa4+OFioUMCUn7 - KBlSzuVkhYCynvZb/cKDUqsNAuu6RINv/J/OmYbSw0aUxmDHtJ//U8lFHA8YBNUVInQZV - HidTyJxBEVLrqqwQPESV1ZB1K0ydeq2rYq5ebrfnl4TyYAOH/Tegg36Tlc8dPebddPaOk - 38+9KJ25xWpVvFs/83MYxxEdLiUztv3FyxE51yd6gDZ4146l8Vc89VLdi35ce4TVsys0A - 80yfr/mi6U0xIEzhoxqaDPpAE65lQ1zFdz7/10JiZiwlgEKrzjiAKy7gYbdfnWhBz0YaA - U+qKRpWX2r+mOrsyBC6TR3fkCofai11VuL3wwJm37wNteUN9WXTWB61CoDKmuMISKwCxf - zP68/8zIekxwRuqKM9aQrqmPg7TEX/GEj7hpUTW/OO6wPktkHX+I6e+FtNTtL33TNRAbh - /MlQspgCDU2QL/2JvfkXxOwxEe143a8vEn6NMyRuQM7gpIB6yeK29bCgXcH3x8= diff --git a/zuul.d/tempest.yaml b/zuul.d/tempest.yaml index ff997475..209fa9b5 100644 --- a/zuul.d/tempest.yaml +++ b/zuul.d/tempest.yaml @@ -1,5 +1,5 @@ --- -# Copyright 2018, SUSE LINUX GmbH. +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,43 +16,42 @@ - project: check: jobs: - - openstack-helm-images-tempest-ubuntu_xenial: - files: &tempest-ubuntuxenial-files - - ^tempest/build.sh - - ^tempest/Dockerfile.ubuntu_xenial$ - - ^zuul.d/tempest.yaml + - openstack-helm-images-build-tempest gate: jobs: - - openstack-helm-images-tempest-ubuntu_xenial: - files: *tempest-ubuntuxenial-files - post: + - openstack-helm-images-upload-tempest + promote: jobs: - - publish-openstack-helm-images-tempest-ubuntu_xenial: - files: *tempest-ubuntuxenial-files + - openstack-helm-images-promote-tempest periodic: jobs: - - openstack-helm-images-tempest-ubuntu_xenial - #experimental: - # jobs: - # - openstack-helm-infra-five-ubuntu + - openstack-helm-images-build-tempest - job: - name: openstack-helm-images-tempest - parent: openstack-helm-images-base - abstract: true - vars: - image_path: tempest + name: openstack-helm-images-build-tempest + parent: openstack-helm-images-build + description: Build tempest images + vars: &tempest_vars + docker_images: + - context: tempest + repository: openstackhelm/tempest + dockerfile: Dockerfile.ubuntu_xenial + tags: + - ubuntu_xenial-latest + files: &tempest_files + - tempest/.* + - zuul.d/tempest.yaml - job: - name: openstack-helm-images-tempest-ubuntu_xenial - parent: openstack-helm-images-tempest - vars: - distro: "ubuntu_xenial" + name: openstack-helm-images-upload-tempest + parent: openstack-helm-images-upload + description: Build and upload tempest images + vars: *tempest_vars + files: *tempest_files - job: - name: publish-openstack-helm-images-tempest-ubuntu_xenial - parent: openstack-helm-images-tempest-ubuntu_xenial - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials + name: openstack-helm-images-promote-tempest + parent: openstack-helm-images-promote + description: Promote a previously published tempest image to latest. + vars: *tempest_vars + files: *tempest_files diff --git a/zuul.d/vbmc.yaml b/zuul.d/vbmc.yaml index fcf5101e..49fd4f8d 100644 --- a/zuul.d/vbmc.yaml +++ b/zuul.d/vbmc.yaml @@ -1,5 +1,5 @@ --- -# Copyright 2018, SUSE LINUX GmbH. +# Copyright 2019, SUSE LINUX GmbH. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,64 +16,47 @@ - project: check: jobs: - - openstack-helm-images-vbmc-centos_7: - files: &vbmc-centos7-files - - ^vbmc/build.sh - - ^vbmc/Dockerfile.centos_7$ - - ^zuul.d/vbmc.yaml - - openstack-helm-images-vbmc-suse_15: - files: &vbmc-suse15-files - - ^vbmc/Dockerfile.suse_15 - - ^vbmc/build.sh - - ^zuul.d/vbmc.yaml + - openstack-helm-images-build-vbmc gate: jobs: - - openstack-helm-images-vbmc-centos_7: - files: *vbmc-centos7-files - - openstack-helm-images-vbmc-suse_15: - files: *vbmc-suse15-files - post: + - openstack-helm-images-upload-vbmc + promote: jobs: - - publish-openstack-helm-images-vbmc-centos_7: - files: *vbmc-centos7-files - - publish-openstack-helm-images-vbmc-suse_15: - files: *vbmc-suse15-files + - openstack-helm-images-promote-vbmc periodic: jobs: - - openstack-helm-images-vbmc-centos_7 - - openstack-helm-images-vbmc-suse_15 + - openstack-helm-images-build-vbmc - job: - name: openstack-helm-images-vbmc - parent: openstack-helm-images-base - abstract: true - vars: - image_path: vbmc + name: openstack-helm-images-build-vbmc + parent: openstack-helm-images-build + description: Build vbmc images + vars: &vbmc_vars + docker_images: + - context: vbmc + repository: openstackhelm/vbmc + tags: + - opensuse_15-latest + dockerfile: Dockerfile.suse_15 + - context: vbmc + repository: openstackhelm/vbmc + dockerfile: Dockerfile.centos_7 + tags: + - centos_7-latest + files: &vbmc_files + - vbmc/.* + - zuul.d/vbmc.yaml - job: - name: openstack-helm-images-vbmc-centos_7 - parent: openstack-helm-images-vbmc - vars: - distro: "centos_7" + name: openstack-helm-images-upload-vbmc + parent: openstack-helm-images-upload + description: Build and upload vbmc images + vars: *vbmc_vars + files: *vbmc_files - job: - name: openstack-helm-images-vbmc-suse_15 - parent: openstack-helm-images-vbmc - vars: - distro: "suse_15" - -- job: - name: publish-openstack-helm-images-vbmc-centos_7 - parent: openstack-helm-images-vbmc-centos_7 - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials - -- job: - name: publish-openstack-helm-images-vbmc-suse_15 - parent: openstack-helm-images-vbmc-suse_15 - post-run: zuul.d/playbooks/publish.yml - post-review: true - secrets: - - openstack_helm_images_publish_credentials + name: openstack-helm-images-promote-vbmc + parent: openstack-helm-images-promote + description: Promote a previously published vbmc image to latest. + vars: *vbmc_vars + files: *vbmc_files