From 1a2adc55d36e8a48fb57ddbae3bbd4ec470295ca Mon Sep 17 00:00:00 2001 From: Alexander Hughes Date: Thu, 16 May 2019 20:16:08 -0400 Subject: [PATCH] Spyglass opensuse image support This patch: 1. Adds an OpenSUSE Dockerfile, as the other Airship projects have done 2. Adds OpenSUSE checks, gate, and publish jobs to .zuul.yaml Change-Id: I210f0233387c28b607fe86d8589a095e892d7fef --- .zuul.yaml | 32 ++++++++++++++++++++ images/spyglass/Dockerfile.opensuse_15 | 42 ++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 images/spyglass/Dockerfile.opensuse_15 diff --git a/.zuul.yaml b/.zuul.yaml index ad667cc..a49bff3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -20,16 +20,19 @@ - openstack-tox-pep8 - spyglass-docker-build-gate-ubuntu_xenial - spyglass-docker-build-gate-ubuntu_bionic + - spyglass-docker-build-gate-opensuse gate: jobs: - openstack-tox-pep8 - spyglass-docker-build-gate-ubuntu_xenial - spyglass-docker-build-gate-ubuntu_bionic + - spyglass-docker-build-gate-opensuse post: jobs: - spyglass-upload-git-mirror - spyglass-docker-publish-ubuntu_xenial - spyglass-docker-publish-ubuntu_bionic + - spyglass-docker-publish-opensuse - nodeset: name: spyglass-single-node @@ -61,6 +64,18 @@ dynamic: patch_set: true +- job: + name: spyglass-docker-build-gate-opensuse + timeout: 1800 + run: tools/gate/playbooks/docker-image-build.yaml + nodeset: spyglass-single-node + vars: + publish: false + distro: opensuse_15 + tags: + dynamic: + patch_set: true + - job: name: spyglass-docker-publish-ubuntu_xenial timeout: 1800 @@ -95,6 +110,23 @@ static: - latest +- job: + name: spyglass-docker-publish-opensuse + timeout: 1800 + run: tools/gate/playbooks/docker-image-build.yaml + nodeset: spyglass-single-node + secrets: + - airship_spyglass_quay_creds + vars: + publish: true + distro: opensuse_15 + tags: + dynamic: + branch: true + commit: true + static: + - latest + - secret: name: airship_spyglass_quay_creds data: diff --git a/images/spyglass/Dockerfile.opensuse_15 b/images/spyglass/Dockerfile.opensuse_15 new file mode 100644 index 0000000..253b825 --- /dev/null +++ b/images/spyglass/Dockerfile.opensuse_15 @@ -0,0 +1,42 @@ +ARG FROM=opensuse/leap:15.0 +FROM ${FROM} + +LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' +LABEL org.opencontainers.image.url='https://airshipit.org' +LABEL org.opencontainers.image.documentation='https://airship-spyglass.readthedocs.org' +LABEL org.opencontainers.image.source='https://opendev.org/airship/spyglass' +LABEL org.opencontainers.image.vendor='The Airship Authors' +LABEL org.opencontainers.image.licenses='Apache-2.0' + +ENV LANG=C.UTF-8 +ENV LC_ALL=C.UTF-8 + +RUN set -x \ + && zypper up -y \ + && zypper --non-interactive install \ + curl \ + gcc \ + git-core \ + python3-dbm \ + python3-devel \ + python3-pip \ + python3-setuptools \ + which \ + && python3 -m pip install -U pip \ + && zypper clean -a \ + && rm -rf \ + /tmp/* \ + /usr/share/doc \ + /usr/share/doc-base \ + /usr/share/man \ + /var/log/* \ + /var/tmp/* + +VOLUME /var/spyglass +WORKDIR /var/spyglass + +COPY requirements.txt /opt/spyglass/requirements.txt +RUN pip3 install --no-cache-dir -r /opt/spyglass/requirements.txt + +COPY . /opt/spyglass +RUN pip3 install -e /opt/spyglass \ No newline at end of file