Updating the image to quay.io airshipit/porthole repo

Adding zuul gates to calicoctl-utility

Change-Id: I5211aade73b642f43b1332a3b681d2ba4cc2e0ae

charts/calicoctl-utility/values.yaml

@@ -19,8 +19,8 @@
 
 images:
   tags:
-    calicoctl_utility: 'docker.io/deepakdt/ctl:v3.4.0'
-    image_repo_sync: docker.io/docker:17.07.0
+    calicoctl_utility: 'quay.io/airshipit/porthole-calicoctl-utility:latest-alpine'
+    image_repo_sync: docker.io/docker:18.09.02
   pull_policy: IfNotPresent
   local_registry:
     active: false

images/calicoctl-utility/Dockerfile.alpine

@@ -0,0 +1,34 @@
+ARG DOCKER_REGISTRY=quay.io
+ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
+ARG CALICOCTL_VERSION=v3.4.4
+
+ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
+
+FROM ${CALICOCTL_IMAGE}
+
+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 export DEBIAN_FRONTEND=noninteractive \
+    && apk add dpkg --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
+    && apk add --update dpkg \
+    && sed -i '/nobody/d' /etc/passwd \
+    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
+    && touch /var/lib/dpkg/status \
+    && apk update \
+    && apk add --update \
+       python python-dev py-pip build-base \
+       sudo screen rsyslog \
+       wget curl socat \
+    && pip install oslo.rootwrap
+
+RUN mv /calicoctl /usr/local/bin/calicoctl \
+    && chmod 0754 /usr/local/bin/calicoctl \
+    && chmod 0754 /usr/bin/socat
+
+WORKDIR /tmp
+ENTRYPOINT ["/bin/sh", "-c"]

images/calicoctl-utility/Dockerfile_calicoctl_only.alpine

@@ -1,36 +0,0 @@
-ARG DOCKER_REGISTRY=quay.io
-ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
-ARG CALICOCTL_VERSION=v3.4.4
-
-ARG CALICOCTL_IMAGE="${DOCKER_REGISTRY}/${CALICOCTL_IMAGE_PREFIX}:${CALICOCTL_VERSION}"
-
-FROM ${CALICOCTL_IMAGE}
-
-ARG CALICOCTL_VERSION=v3.4.4
-
-LABEL org.opencontainers.image.authors='Openstack-Helm Authors' \
-    org.opencontainers.image.url='https://opendev.org/airship/porthole/src/branch/master/Dockerfiles/calicoctl-utility' \
-    org.opencontainers.image.documentation='https://opendev.org/airship/porthole/src/branch/master/Dockerfiles/calicoctl-utility/README' \
-    org.opencontainers.image.source='https://opendev.org/airship/porthole/src/branch/master/Dockerfiles/calicoctl-utility' \
-    org.opencontainers.image.vendor='Openstack-Helm Authors' \
-    org.opencontainers.image.licenses='BSD-3-Clause' \
-    org.projectcalico.calicoctl.version="${CALICOCTL_VERSION}"
-
-RUN set -xe \
-    && export DEBIAN_FRONTEND=noninteractive \
-    && apk add dpkg --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main \
-    && apk add --update dpkg \
-    && touch /var/lib/dpkg/status \
-    && apk update \
-    && apk add --update \
-       python python-dev py-pip build-base \
-       sudo vim screen rsyslog \
-       wget curl socat \
-    && pip install oslo.rootwrap
-
-RUN mv /calicoctl /usr/local/bin/calicoctl \
-    && chmod 0754 /usr/local/bin/calicoctl \
-    && chmod 0754 /usr/bin/socat
-
-WORKDIR /tmp
-ENTRYPOINT ["/bin/sh", "-c"]

zuul.d/base.yaml

@@ -16,6 +16,7 @@
     check:
       jobs:
         - airship-porthole-linter
+        - airship-porthole-images-build-gate-calicoctl-utility
         - airship-porthole-images-build-gate-ceph-utility
         - airship-porthole-images-build-gate-etcdctl-utility
         - airship-porthole-images-build-gate-mysqlclient-utility
@@ -24,6 +25,7 @@
     gate:
       jobs:
         - airship-porthole-linter
+        - airship-porthole-images-build-gate-calicoctl-utility
         - airship-porthole-images-build-gate-ceph-utility
         - airship-porthole-images-build-gate-etcdctl-utility
         - airship-porthole-images-build-gate-mysqlclient-utility
@@ -31,6 +33,7 @@
 
     post:
       jobs:
+        - airship-porthole-images-publish-calicoctl-utility
         - airship-porthole-images-publish-ceph-utility
         - airship-porthole-images-publish-etcdctl-utility
         - airship-porthole-images-publish-mysqlclient-utility

zuul.d/calicoctl-utility.yaml

@@ -0,0 +1,41 @@
+# 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-calicoctl-utility
+    parent: &parent airship-porthole-images
+    vars:
+      image_name: &image_name porthole-calicoctl-utility
+      distro_suffix: &distro_suffix alpine
+    files:
+      - ^charts/calicoctl-utility/.*$
+      - ^images/calicoctl-utility/.*$
+      - ^Makefile$
+      - ^tools/.*$
+      - ^zuul.d/.*$
+
+- job:
+    name: airship-porthole-images-publish-calicoctl-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