From 997497d8f4a054b1f2eff7fc7b6afee1a006f3b2 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 13 Sep 2019 09:29:00 +0200 Subject: [PATCH] Remove unneeded Zuul branch matcher We have implicit branch matchers, so there's no need to add a check for not-ocata, this job is only run for the branch it's on - like master now. Remove it to not confuse Zuul when multiple branches matches and the job is different. Also fix heat-container-agent to make linking of /usr/bin/python to python3 conditional on whether it already exists. Change-Id: I1fec9d19cd14cf2fe2473b7610870e8d669021b9 --- .zuul.yaml | 3 --- dockerfiles/heat-container-agent/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 37e0e07e91..008d42df41 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -177,7 +177,6 @@ name: magnum-functional-swarm-mode parent: magnum-functional-coe voting: false - branches: ^(?!stable/(newton|ocata)).*$ vars: coe: swarm-mode irrelevant-files: @@ -195,7 +194,6 @@ name: magnum-functional-dcos parent: magnum-functional-coe voting: false - branches: ^(?!stable/(newton|ocata)).*$ vars: coe: dcos irrelevant-files: @@ -296,7 +294,6 @@ name: magnum-functional-swarm-mode-multinode parent: magnum-functional-multinode-base voting: false - branches: ^(?!stable/(newton|ocata)).*$ vars: coe: swarm-mode irrelevant-files: diff --git a/dockerfiles/heat-container-agent/Dockerfile b/dockerfiles/heat-container-agent/Dockerfile index 76402f1ee0..599a0e03bd 100644 --- a/dockerfiles/heat-container-agent/Dockerfile +++ b/dockerfiles/heat-container-agent/Dockerfile @@ -57,7 +57,7 @@ RUN /tmp/write-os-apply-config-templates.sh COPY manifest.json service.template config.json.template tmpfiles.template /exports/ -RUN ln -s /usr/bin/python3 /usr/bin/python +RUN if [ ! -f /usr/bin/python ]; then ln -s /usr/bin/python3 /usr/bin/python; fi COPY launch /usr/bin/start-heat-container-agent