diff --git a/charts/ceph-utility/values.yaml b/charts/ceph-utility/values.yaml index 487d9d06..4c0af569 100644 --- a/charts/ceph-utility/values.yaml +++ b/charts/ceph-utility/values.yaml @@ -25,8 +25,8 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_utility: 'docker.io/sreejithpunnapuzha/ceph-utility:v0.0.3' - image_repo_sync: docker.io/docker:17.07.0 + ceph_utility: 'quay.io/airshipit/porthole-ceph-utility:latest' + image_repo_sync: docker.io/docker:18.09.02 local_registry: active: false exclude: diff --git a/images/ceph-utility/Dockerfile.ubuntu_xenial b/images/ceph-utility/Dockerfile.ubuntu_xenial index 3c2c609f..4f2e8356 100755 --- a/images/ceph-utility/Dockerfile.ubuntu_xenial +++ b/images/ceph-utility/Dockerfile.ubuntu_xenial @@ -1,6 +1,13 @@ ARG FROM=docker.io/ubuntu:xenial FROM ${FROM} +LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ + org.opencontainers.image.url='https://airshipit.org' \ + org.opencontainers.image.documentation='https://opendev.org/airship/porthole' \ + org.opencontainers.image.source='https://opendev.org/airship/porthole' \ + org.opencontainers.image.vendor='The Airship Authors' \ + org.opencontainers.image.licenses='Apache-2.0' + ARG CEPH_RELEASE=mimic ARG KUBE_VERSION=1.12.2 diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 2adcebd6..fb58c129 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -17,15 +17,18 @@ jobs: - airship-porthole-linter - airship-porthole-images-build-gate-mysqlclient-utility + - airship-porthole-images-build-gate-ceph-utility gate: jobs: - airship-porthole-linter - airship-porthole-images-build-gate-mysqlclient-utility + - airship-porthole-images-build-gate-ceph-utility post: jobs: - airship-porthole-images-publish-mysqlclient-utility + - airship-porthole-images-publish-ceph-utility - nodeset: name: airship-porthole-single-node diff --git a/zuul.d/ceph-utility.yaml b/zuul.d/ceph-utility.yaml new file mode 100644 index 00000000..9cdfb92c --- /dev/null +++ b/zuul.d/ceph-utility.yaml @@ -0,0 +1,43 @@ +# Copyright 2019 AT&T Intellectual Property. All other rights reserved. +# +# 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 +# +# https://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. + +- job: + name: airship-porthole-images-build-gate-ceph-utility + parent: &parent airship-porthole-images + vars: + image_name: &image_name ceph-utility + distro_suffix: &distro_suffix ubuntu_xenial + files: + - ^Dockerfiles/ceph-utility/.*$ + - ^install_ceph_utility.sh$ + - ^ceph-utility/.*$ + - ^Makefile$ + - ^tools/.*$ + - ^zuul.d/.*$ + +- job: + name: airship-porthole-images-publish-ceph-utility + parent: *parent + secrets: + - name: quay_credentials + secret: quay_credentials + pass-to-parent: true + vars: + image_name: *image_name + distro_suffix: *distro_suffix + publish: true + tags: + dynamic: + commit: true +