From 33ce5287569894a7054318f4c01efeeb70a2152d Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Mon, 23 Sep 2019 19:32:28 +0200 Subject: [PATCH] Image builds and publishing, CI gates This patch set removes porthole-images-build and porthole-images-upload zuul jobs, as they seem to be not used. Parent job upload-docker-image currently does not support quay.io registry. Add Zuul jobs to build and upload to quay.io mysqlclient-utility container image, basing on other Airship project jobs. Change Dockerfile of mysqlclient-utility to make it more consistent with other Airship Dockerfiles. Removed mysqlclient-utility/build.sh, as this seem not to be used. Rewrite Makefile to support build-image-$(IMAGE_NAME) target, which should be used to build images from different directories and allows to base them on different base image. Remove Makefile targets (pull-all-images, pull-images, dev-deploy) which could not be executed anyway, because of absence of scripts they refer to. Remove other unused Makefile targets. Adjust copyright (license) message in files which are largely sourced from Airship Apache 2.0 code. Removed calicoctl, ceph, compute and openstack -utility jobs, as this jobs only do linting of the same code multiple time, burdening OpenStack Infrastructure. Added one linting job which runs agains complete code base. Removed unused helm_install.sh, helm_tk.sh and install_*_utility.sh scripts. Change-Id: I2d8f4b0cfaa6a8def0539ce6c40cc3c320f36a7d --- .../Dockerfile.ubuntu_xenial | 59 +++++---- Dockerfiles/mysqlclient-utility/build.sh | 19 --- Makefile | 114 ++++++++++++------ install_ceph_utility.sh | 54 --------- install_compute_utility.sh | 18 --- install_mysqlclient_utility.sh | 19 --- install_openstack_utility.sh | 20 --- ...ge-upload.yaml => docker-image-build.yaml} | 37 ++++-- tools/gate/playbooks/zuul-linter.yaml | 8 +- tools/helm_install.sh | 44 ------- tools/helm_tk.sh | 76 ------------ zuul.d/base.yaml | 57 ++++++--- zuul.d/calicoctl-utility.yaml | 35 ------ zuul.d/ceph-utility.yaml | 35 ------ zuul.d/compute-utility.yaml | 36 ------ zuul.d/mysqlclient-utility.yaml | 82 ++++--------- zuul.d/openstack-utility.yaml | 35 ------ 17 files changed, 205 insertions(+), 543 deletions(-) delete mode 100644 Dockerfiles/mysqlclient-utility/build.sh delete mode 100755 install_ceph_utility.sh delete mode 100755 install_compute_utility.sh delete mode 100755 install_mysqlclient_utility.sh delete mode 100755 install_openstack_utility.sh rename tools/gate/playbooks/{docker-image-upload.yaml => docker-image-build.yaml} (75%) delete mode 100644 tools/helm_install.sh delete mode 100644 tools/helm_tk.sh delete mode 100644 zuul.d/calicoctl-utility.yaml delete mode 100644 zuul.d/ceph-utility.yaml delete mode 100644 zuul.d/compute-utility.yaml delete mode 100644 zuul.d/openstack-utility.yaml diff --git a/Dockerfiles/mysqlclient-utility/Dockerfile.ubuntu_xenial b/Dockerfiles/mysqlclient-utility/Dockerfile.ubuntu_xenial index 6cb7eb80..ed6cd21e 100644 --- a/Dockerfiles/mysqlclient-utility/Dockerfile.ubuntu_xenial +++ b/Dockerfiles/mysqlclient-utility/Dockerfile.ubuntu_xenial @@ -1,28 +1,35 @@ -ARG FROM=docker.io/ubuntu:xenial +ARG FROM=ubuntu:16.04 FROM ${FROM} -MAINTAINER Trung Thai -RUN set -xe \ - && sed -i '/nobody/d' /etc/passwd \ - && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd ;\ - apt-get update ;\ - apt-get dist-upgrade -y ;\ - apt-get install -y \ - bash \ - moreutils \ - vim \ - sudo \ - screen \ - rsyslog \ - python-oslo.rootwrap \ - python3-oslo.rootwrap \ - mysql-client ;\ - sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf ; \ - apt-get clean -y ;\ - rm -rf \ - /var/cache/debconf/* \ - /var/lib/apt/lists/* \ - /var/log/* \ - /tmp/* \ - /var/tmp/* -CMD ["/bin/bash"] \ No newline at end of file +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' + +RUN set -xe && \ + sed -i '/nobody/d' /etc/passwd && \ + echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd && \ + apt-get update && \ + apt-get dist-upgrade -y && \ + apt-get install -y \ + bash \ + moreutils \ + mysql-client \ + python-oslo.rootwrap \ + python3-oslo.rootwrap \ + screen \ + sudo \ + rsyslog \ + vim && \ + sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf && \ + apt-get clean -y && \ + rm -rf \ + /tmp/* \ + /var/cache/debconf/* \ + /var/lib/apt/lists/* \ + /var/log/* \ + /var/tmp/* + +CMD ["/bin/bash"] diff --git a/Dockerfiles/mysqlclient-utility/build.sh b/Dockerfiles/mysqlclient-utility/build.sh deleted file mode 100644 index 8af15491..00000000 --- a/Dockerfiles/mysqlclient-utility/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -xe -SCRIPT=`realpath $0` -SCRIPT_DIR=`dirname ${SCRIPT}` -## Only build from main folder -cd ${SCRIPT_DIR}/.. - -IMAGE="mysqlclient-utility" -VERSION=${VERSION:-latest} -DISTRO=${DISTRO:-ubuntu_xenial} -REGISTRY_URI=${REGISTRY_URI:-"airshipit/"} -EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} -docker build \ --f ${IMAGE}/Dockerfile.${DISTRO} \ ---network=host \ --t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} \ -${extra_build_args} ${IMAGE} - -cd - diff --git a/Makefile b/Makefile index 6d01bdb0..2052064b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -# Copyright 2017 The Openstack-Helm Authors. +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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, @@ -15,48 +15,86 @@ # It's necessary to set this because some environments don't link sh -> bash. SHELL := /bin/bash -HELM := helm -TASK := build +# APP INFO +DOCKER_REGISTRY ?= quay.io +IMAGE_PREFIX ?= airshipit +IMAGE_NAME ?= +IMAGE_TAG ?= latest +PROXY ?= http://proxy.foo.com:8000 +NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local +USE_PROXY ?= false +PUSH_IMAGE ?= false +# use this variable for image labels added in internal build process +LABEL ?= org.airshipit.build=community +COMMIT ?= $(shell git rev-parse HEAD) +DISTRO_SUFFIX ?= $(DISTRO) +IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}-${DISTRO_SUFFIX} +BASE_IMAGE ?= -EXCLUDES := helm-toolkit docs tools logs tmp Dockerfiles zuul.d -CHARTS := helm-toolkit $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) +# VERSION INFO +GIT_COMMIT = ${COMMIT} +GIT_SHA = $(shell git rev-parse --short HEAD) +GIT_TAG = $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null) +GIT_DIRTY = $(shell test -n "`git status --porcelain`" && echo "dirty" || echo "clean") -.PHONY: $(EXCLUDES) $(CHARTS) +ifdef VERSION + DOCKER_VERSION = $(VERSION) +endif -all: $(CHARTS) +ifeq "$(DISTRO_SUFFIX)" "" + DOCKERFILE = "Dockerfiles/$(IMAGE_NAME)/Dockerfile" +else + DOCKERFILE = "Dockerfiles/$(IMAGE_NAME)/Dockerfile.$(DISTRO_SUFFIX)" +endif -$(CHARTS): - @echo - @echo "===== Processing [$@] chart =====" - @make $(TASK)-$@ +info: + @echo "Version: ${VERSION}" + @echo "Git Tag: ${GIT_TAG}" + @echo "Git Commit: ${GIT_COMMIT}" + @echo "Git Tree State: ${GIT_DIRTY}" + @echo "Docker Version: ${DOCKER_VERSION}" + @echo "Registry: ${DOCKER_REGISTRY}" -init-%: - if [ -f $*/Makefile ]; then make -C $*; fi - if [ -f $*/requirements.yaml ]; then helm dep up $*; fi +all: + @echo "And what is there's nothing in there? You die, and there's" \ + "nothing beyond that. Nothing. Nothing remains. Someone might" \ + "remember you for a little while after but not for long.">&2; exit 2 -lint-%: init-% - if [ -d $* ]; then $(HELM) lint $*; fi +check-docker: + @if [ -z $$(which docker) ]; then \ + echo "Missing \`docker\` client which is required for development"; \ + exit 2; \ + fi -build-%: lint-% - if [ -d $* ]; then $(HELM) package $*; fi +_BASE_IMAGE_ARG := $(if $(BASE_IMAGE),--build-arg FROM="${BASE_IMAGE}" ,) -clean: - @echo "Removed .b64, _partials.tpl, and _globals.tpl files" - rm -f helm-toolkit/secrets/*.b64 - rm -f */templates/_partials.tpl - rm -f */templates/_globals.tpl - rm -f *tgz */charts/*tgz - rm -f */requirements.lock - -rm -rf */charts */tmpcharts +build-image-$(IMAGE_NAME): check-docker +ifeq "$(IMAGE_NAME)" "" + @echo "Missing \`IMAGE_NAME\` variable." >&2; exit 2 +endif +ifeq ($(USE_PROXY), true) + docker build --network host -t $(IMAGE) --label $(LABEL) \ + --label "org.opencontainers.image.revision=$(COMMIT)" \ + --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \ + --label "org.opencontainers.image.title=$(IMAGE_NAME)" \ + -f $(DOCKERFILE) \ + $(_BASE_IMAGE_ARG) \ + --build-arg http_proxy=$(PROXY) \ + --build-arg https_proxy=$(PROXY) \ + --build-arg HTTP_PROXY=$(PROXY) \ + --build-arg HTTPS_PROXY=$(PROXY) \ + --build-arg no_proxy=$(NO_PROXY) \ + --build-arg NO_PROXY=$(NO_PROXY) . +else + docker build --network host -t $(IMAGE) --label $(LABEL) \ + --label "org.opencontainers.image.revision=$(COMMIT)" \ + --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \ + --label "org.opencontainers.image.title=$(IMAGE_NAME)" \ + -f $(DOCKERFILE) \ + $(_BASE_IMAGE_ARG) . +endif +ifeq ($(PUSH_IMAGE), true) + docker push $(IMAGE) +endif -pull-all-images: - @./tools/pull-images.sh - -pull-images: - @./tools/pull-images.sh $(filter-out $@,$(MAKECMDGOALS)) - -dev-deploy: - @./tools/gate/devel/start.sh $(filter-out $@,$(MAKECMDGOALS)) - -%: - @: +.PHONY: all build-image-$(IMAGE_NAME) build-image-% check-docker info diff --git a/install_ceph_utility.sh b/install_ceph_utility.sh deleted file mode 100755 index b78322ff..00000000 --- a/install_ceph_utility.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -set -xe - -#NOTE: Lint and package chart -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} -#: ${PORTHOLE_PATH}:="" -make -C ${OSH_INFRA_PATH} ceph-provisioners - -#NOTE: Deploy command -: ${OSH_EXTRA_HELM_ARGS:=""} -tee /tmp/ceph-utility-config.yaml < + find . + -not -path "*/.git/*" + -type f + -exec egrep -l " +$" {} \; register: result - failed_when: result.stdout != "" \ No newline at end of file + failed_when: result.stdout != "" diff --git a/tools/helm_install.sh b/tools/helm_install.sh deleted file mode 100644 index 9c294ad6..00000000 --- a/tools/helm_install.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# 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 -# -# 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. -# - -set -x - -HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://storage.googleapis.com/kubernetes-helm/helm-v2.14.0-linux-amd64.tar.gz"} - - -function install_helm_binary { - if [[ -z "${HELM}" ]] - then - echo "No Helm binary target location." - exit -1 - fi - - if [[ -w "$(dirname ${HELM})" ]] - then - TMP_DIR=${BUILD_DIR:-$(mktemp -d)} - curl -o "${TMP_DIR}/helm.tar.gz" "${HELM_ARTIFACT_URL}" - pushd ${TMP_DIR} - tar -xvzf helm.tar.gz - cp "linux-amd64/helm" "helm" - popd - else - echo "Cannot write to ${HELM}" - exit -1 - fi -} - -install_helm_binary diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh deleted file mode 100644 index c65df800..00000000 --- a/tools/helm_tk.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# 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 -# -# 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. -# -# Script to setup helm-toolkit and helm dep up the shipyard chart -# -HELM=$1 -HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"} -HTK_PATH=${HTK_PATH:-""} -HTK_STABLE_COMMIT=${HTK_COMMIT:-"200b5e902b3a176fbfbe669b6a10a254c9b50f5d"} -DEP_UP_LIST=${DEP_UP_LIST:-"porthole"} -BUILD_DIR=${BUILD_DIR:-$(mktemp -d)} - -if [[ ! -z $(echo $http_proxy) ]] -then - export no_proxy=$no_proxy,127.0.0.1 -fi - -set -x - -# Use ./helm as we expect this to be run in a already -# configured build directory - -function helm_serve { - if [[ -d "$HOME/.helm" ]]; then - echo ".helm directory found" - else - ${HELM} init --client-only --skip-refresh - fi - if [[ -z $(curl --noproxy '*' -s 127.0.0.1:8879 | grep 'Helm Repository') ]]; then - "${HELM}" serve & > /dev/null - while [[ -z $(curl --noproxy '*' -s 127.0.0.1:8879 | grep 'Helm Repository') ]]; do - sleep 1 - echo "Waiting for Helm Repository" - done - else - echo "Helm serve already running" - fi - - if "${HELM}" repo list | grep -q "^stable" ; then - "${HELM}" repo remove stable - fi - - ${HELM} repo add local http://localhost:8879/charts -} - -mkdir -p "$BUILD_DIR" -pushd "$BUILD_DIR" -git clone $HTK_REPO || true -pushd openstack-helm-infra/$HTK_PATH -git reset --hard "${HTK_STABLE_COMMIT}" - -helm_serve -# OSH Makefile is bugged, so ensure helm is in the path -if [[ ${HELM} != "helm" ]] -then - export PATH=${PATH}:$(dirname ${HELM}) -fi - -make helm-toolkit -popd && popd -for c in $DEP_UP_LIST -do - ${HELM} dep up charts/$c -done diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 76ba4619..e1a30f55 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -1,8 +1,10 @@ +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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, @@ -10,6 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. +- project: + check: + jobs: + - porthole-lint + - porthole-image-build-mysqlclient-utility + + gate: + jobs: + - porthole-lint + - porthole-image-build-mysqlclient-utility + + post: + jobs: + - porthole-image-upload-mysqlclient-utility + - nodeset: name: airship-porthole-single-node nodes: @@ -17,28 +34,28 @@ label: ubuntu-xenial - job: - name: porthole-images-build - parent: build-docker-image + name: porthole-images abstract: true - ansible-version: 2.8 - description: | - irrelevant-files: - - ^\.git.* - - ^.*\.(example|md|rst)$ - - ^doc/.* - - ^releasenotes/.* - timeout: 3600 + timeout: 1800 + post-timeout: 1800 + run: tools/gate/playbooks/docker-image-build.yaml + nodeset: airship-porthole-single-node + vars: + publish: false + tags: + dynamic: + branch: true + commit: false + static: + - latest - job: - name: porthole-images-upload - parent: upload-docker-image - abstract: true - ansible-version: 2.8 - secrets: - name: quay_credentials - secret: quay_credentials - pass-to-parent: true - timeout: 3600 + name: porthole-lint + description: | + Lints files for trailing whitespace + run: tools/gate/playbooks/zuul-linter.yaml + timeout: 300 + nodeset: airship-porthole-single-node - secret: name: quay_credentials diff --git a/zuul.d/calicoctl-utility.yaml b/zuul.d/calicoctl-utility.yaml deleted file mode 100644 index 465c6ddd..00000000 --- a/zuul.d/calicoctl-utility.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2019 The Openstack-Helm Authors. -# -# 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: - check: - jobs: - - porthole-calicoctl-utility-lint-ws - gate: - jobs: - - porthole-calicoctl-utility-lint-ws - -- nodeset: - name: porthole-calicoctl-utility-single-node - nodes: - - name: primary - label: ubuntu-xenial - -- job: - name: porthole-calicoctl-utility-lint-ws - description: | - Lints all files by checking them for whitespace. - run: tools/gate/playbooks/zuul-linter.yaml - timeout: 300 - nodeset: porthole-calicoctl-utility-single-node diff --git a/zuul.d/ceph-utility.yaml b/zuul.d/ceph-utility.yaml deleted file mode 100644 index bd526125..00000000 --- a/zuul.d/ceph-utility.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2019 The Openstack-Helm Authors. -# -# 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: - check: - jobs: - - porthole-ceph-utility-lint-ws - gate: - jobs: - - porthole-ceph-utility-lint-ws - -- nodeset: - name: porthole-ceph-utility-single-node - nodes: - - name: primary - label: ubuntu-xenial - -- job: - name: porthole-ceph-utility-lint-ws - description: | - Lints all files by checking them for whitespace. - run: tools/gate/playbooks/zuul-linter.yaml - timeout: 300 - nodeset: porthole-ceph-utility-single-node diff --git a/zuul.d/compute-utility.yaml b/zuul.d/compute-utility.yaml deleted file mode 100644 index c23cec4d..00000000 --- a/zuul.d/compute-utility.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2019 The Openstack-Helm Authors. -# -# 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: - check: - jobs: - - porthole-compute-utility-lint-ws - gate: - jobs: - - porthole-compute-utility-lint-ws - -- nodeset: - name: porthole-compute-utility-single-node - nodes: - - name: primary - label: ubuntu-xenial - -- job: - name: porthole-compute-utility-lint-ws - description: | - Lints all files by checking them for whitespace. - run: tools/gate/playbooks/zuul-linter.yaml - timeout: 300 - nodeset: porthole-compute-utility-single-node - diff --git a/zuul.d/mysqlclient-utility.yaml b/zuul.d/mysqlclient-utility.yaml index a7ba6236..544ca08c 100644 --- a/zuul.d/mysqlclient-utility.yaml +++ b/zuul.d/mysqlclient-utility.yaml @@ -1,10 +1,10 @@ -# Copyright 2019 The Airship Authors. +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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, @@ -12,64 +12,32 @@ # See the License for the specific language governing permissions and # limitations under the License. -- project: - check: - jobs: - - porthole-mysqlclient-lint-ws - - porthole-mysqlclient-images-build - - gate: - jobs: - - porthole-mysqlclient-lint-ws - - porthole-mysqlclient-images-build - - post: - jobs: - - porthole-mysqlclient-images-upload - - job: - name: porthole-mysqlclient-lint-ws - description: | - Lints all files for trailing whitespace - run: tools/gate/playbooks/zuul-linter.yaml - timeout: 300 - nodeset: airship-porthole-single-node - -- job: - name: porthole-mysqlclient-images-build - parent: porthole-images-build - description: Build mysqclient images - vars: &mysqlclient_vars - currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}" - docker_images: - - context: Dockerfiles/mysqlclient-utility - repository: porthole/mysqlclient-utility - dockerfile: Dockerfile.ubuntu_xenial - tags: - - latest-ubuntu_xenial - - "ubuntu_xenial-{{ currentdate }}" - files: &mysqlclient_files - - Dockerfiles/mysqlclient-utility/.* - - zuul.d/mysqlclient-utility.yaml - -- job: - name: porthole-mysqlclient-images-upload - timeout: 1800 - run: tools/gate/playbooks/docker-image-upload.yaml - nodeset: airship-porthole-single-node - secrets: - - quay_credentials + name: porthole-image-build-mysqlclient-utility + parent: &parent porthole-images vars: + image_name: &image_name mysqlclient-utility + distro_suffix: &distro_suffix ubuntu_xenial + files: &mysqlclient_files + - ^Dockerfiles/mysqlclient-utility/.*$ + - ^install_mysqlclient_utility.sh$ + - ^mysqlclient-utility/.*$ + - ^Makefile$ + - ^tools/.*$ + - ^zuul.d/.*$ + +- job: + name: porthole-image-upload-mysqlclient-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: - branch: true commit: true - static: - - latest - irrelevant-files: - - ^charts/.*$ - - ^etc/.*$ - - ^tests/.*$ - - ^tools/.*$ - + files: *mysqlclient_files diff --git a/zuul.d/openstack-utility.yaml b/zuul.d/openstack-utility.yaml deleted file mode 100644 index d3da4be7..00000000 --- a/zuul.d/openstack-utility.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2019 The Openstack-Helm Authors. -# -# 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: - check: - jobs: - - porthole-openstack-utility-lint-ws - gate: - jobs: - - porthole-openstack-utility-lint-ws - -- nodeset: - name: porthole-openstack-utility-single-node - nodes: - - name: primary - label: ubuntu-xenial - -- job: - name: porthole-openstack-utility-lint-ws - description: | - Lints all files by checking them for whitespace. - run: tools/gate/playbooks/zuul-linter.yaml - timeout: 300 - nodeset: porthole-openstack-utility-single-node