Merge "Revert "Component promotion jobs should read a custom release cfg""

This commit is contained in:
Zuul 2019-12-03 16:28:21 +00:00 committed by Gerrit Code Review
commit 7679b71817

View File

@ -103,15 +103,10 @@ fi
{% if periodic|bool %} {% if periodic|bool %}
PERIODIC=1 PERIODIC=1
{% if component_promotion is defined %}
QUICKSTART_RELEASE="component-{{ component_promotion }}-${QUICKSTART_RELEASE}"
{% else %}
QUICKSTART_RELEASE="promotion-testing-hash-${QUICKSTART_RELEASE}" QUICKSTART_RELEASE="promotion-testing-hash-${QUICKSTART_RELEASE}"
{% endif %}
EMIT_RELEASES_EXTRA_ARGS="$EMIT_RELEASES_EXTRA_ARGS --is-periodic" EMIT_RELEASES_EXTRA_ARGS="$EMIT_RELEASES_EXTRA_ARGS --is-periodic"
{% endif %} {% endif %}
if [[ -f "$RELEASES_SCRIPT" ]] && [[ {{ featureset }} =~ 010|011|037|047|050|056 ]]; then if [[ -f "$RELEASES_SCRIPT" ]] && [[ {{ featureset }} =~ 010|011|037|047|050|056 ]]; then
if [[ -f "$RELEASES_FILE_OUTPUT" ]]; then if [[ -f "$RELEASES_FILE_OUTPUT" ]]; then