From 99c3fbff7847ab2601f0836abee3f67d1a23755b Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 23 Oct 2019 17:09:33 +0900
Subject: [PATCH] Add job dependencies to haproxy-statsd
haproxy-statsd uses opendevorg/python-base already. Add that to its
job dependencies and make sure it triggers on updates to python-base.
Update the FROM line to be fully qualified.
Change-Id: I9c8e8094f5570bf44076915610cd1be6d95ed326
---
.zuul.yaml | 11 +++++++++--
docker/haproxy-statsd/Dockerfile | 2 +-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/.zuul.yaml b/.zuul.yaml
index 5297fd3aaf..a7df049b8b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -148,6 +148,7 @@
# Duplicate in the run-gitea job
files: &haproxy-statsd_files
- docker/haproxy-statsd/.*
+ - docker/python-base/.*
- job:
name: system-config-upload-image-haproxy-statsd
@@ -1108,7 +1109,10 @@
soft: true
- name: system-config-build-image-gerrit-base
soft: true
- - system-config-build-image-haproxy-statsd
+ - system-config-build-image-haproxy-statsd:
+ dependencies:
+ - name: system-config-build-image-python-base
+ soft: true
- system-config-build-image-python-base
- system-config-build-image-python-builder
gate:
@@ -1173,7 +1177,10 @@
soft: true
- name: system-config-upload-image-gerrit-base
soft: true
- - system-config-upload-image-haproxy-statsd
+ - system-config-upload-image-haproxy-statsd:
+ dependencies:
+ - name: system-config-upload-image-python-base
+ soft: true
- system-config-upload-image-python-base
- system-config-upload-image-python-builder
promote:
diff --git a/docker/haproxy-statsd/Dockerfile b/docker/haproxy-statsd/Dockerfile
index e65152af26..9009d08694 100644
--- a/docker/haproxy-statsd/Dockerfile
+++ b/docker/haproxy-statsd/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM opendevorg/python-base
+FROM docker.io/opendevorg/python-base
COPY haproxy-statsd.py /usr/local/bin
RUN pip install statsd