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
This commit is contained in:
parent
a36fb7af50
commit
997497d8f4
|
@ -177,7 +177,6 @@
|
||||||
name: magnum-functional-swarm-mode
|
name: magnum-functional-swarm-mode
|
||||||
parent: magnum-functional-coe
|
parent: magnum-functional-coe
|
||||||
voting: false
|
voting: false
|
||||||
branches: ^(?!stable/(newton|ocata)).*$
|
|
||||||
vars:
|
vars:
|
||||||
coe: swarm-mode
|
coe: swarm-mode
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
|
@ -195,7 +194,6 @@
|
||||||
name: magnum-functional-dcos
|
name: magnum-functional-dcos
|
||||||
parent: magnum-functional-coe
|
parent: magnum-functional-coe
|
||||||
voting: false
|
voting: false
|
||||||
branches: ^(?!stable/(newton|ocata)).*$
|
|
||||||
vars:
|
vars:
|
||||||
coe: dcos
|
coe: dcos
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
|
@ -296,7 +294,6 @@
|
||||||
name: magnum-functional-swarm-mode-multinode
|
name: magnum-functional-swarm-mode-multinode
|
||||||
parent: magnum-functional-multinode-base
|
parent: magnum-functional-multinode-base
|
||||||
voting: false
|
voting: false
|
||||||
branches: ^(?!stable/(newton|ocata)).*$
|
|
||||||
vars:
|
vars:
|
||||||
coe: swarm-mode
|
coe: swarm-mode
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
|
|
|
@ -57,7 +57,7 @@ RUN /tmp/write-os-apply-config-templates.sh
|
||||||
|
|
||||||
COPY manifest.json service.template config.json.template tmpfiles.template /exports/
|
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
|
COPY launch /usr/bin/start-heat-container-agent
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue