diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index bcfd8a82bf..c85178ab51 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -164,8 +164,8 @@ - import_role: name: openshift/start-build vars: - app: bodhi - buildname: bodhi-base + start_build_app: bodhi + start_build_buildname: bodhi-base when: env != "staging" post_tasks: diff --git a/playbooks/openshift-apps/asknot.yml b/playbooks/openshift-apps/asknot.yml index 6e37a92348..707d5f4091 100644 --- a/playbooks/openshift-apps/asknot.yml +++ b/playbooks/openshift-apps/asknot.yml @@ -28,9 +28,9 @@ object_objectname: buildconfig.yml - role: openshift/start-build - app: asknot - buildname: asknot-build - objectname: asknot-build + start_build_app: asknot + start_build_buildname: asknot-build + start_build_objectname: asknot-build - role: openshift/object object_app: asknot diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index d177659a09..847607bd2b 100644 --- a/playbooks/openshift-apps/badges.yml +++ b/playbooks/openshift-apps/badges.yml @@ -195,8 +195,8 @@ object_objectname: cron-update-rules.yml - role: openshift/start-build - app: badges - buildname: "{{ item }}" + start_build_app: badges + start_build_buildname: "{{ item }}" loop: - fedbadges - tahrir diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index 7a03f0921e..8ccece2847 100644 --- a/playbooks/openshift-apps/blockerbugs.yml +++ b/playbooks/openshift-apps/blockerbugs.yml @@ -134,6 +134,6 @@ haproxy.router.openshift.io/set-forwarded-headers: append - role: openshift/start-build - app: blockerbugs - buildname: blockerbugs-build - objectname: blockerbugs-build + start_build_app: blockerbugs + start_build_buildname: blockerbugs-build + start_build_objectname: blockerbugs-build diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index 17f8a24dd0..8af6a6184a 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -106,8 +106,8 @@ object_template: buildconfig.yml object_objectname: buildconfig.yml - role: openshift/start-build - app: bodhi - buildname: bodhi-base + start_build_app: bodhi + start_build_buildname: bodhi-base - role: openshift/object object_app: bodhi object_template_fullpath: "{{roles_path}}/bodhi2/base/templates/configmap.yml" diff --git a/playbooks/openshift-apps/cloud-image-uploader.yml b/playbooks/openshift-apps/cloud-image-uploader.yml index eeeb72ac42..f29b0b13e3 100644 --- a/playbooks/openshift-apps/cloud-image-uploader.yml +++ b/playbooks/openshift-apps/cloud-image-uploader.yml @@ -122,9 +122,9 @@ object_objectname: container-secrets.yml - role: openshift/start-build - app: cloud-image-uploader - buildname: cloud-image-uploader-build - objectname: cloud-image-uploader-build + start_build_app: cloud-image-uploader + start_build_buildname: cloud-image-uploader-build + start_build_objectname: cloud-image-uploader-build - role: openshift/object object_app: cloud-image-uploader diff --git a/playbooks/openshift-apps/compose-tracker.yml b/playbooks/openshift-apps/compose-tracker.yml index 5d9a0c784d..ea06df6023 100644 --- a/playbooks/openshift-apps/compose-tracker.yml +++ b/playbooks/openshift-apps/compose-tracker.yml @@ -36,9 +36,9 @@ object_objectname: buildconfig.yml - role: openshift/start-build - app: compose-tracker - buildname: compose-tracker-build - objectname: compose-tracker-build + start_build_app: compose-tracker + start_build_buildname: compose-tracker-build + start_build_objectname: compose-tracker-build - role: openshift/object object_app: compose-tracker diff --git a/playbooks/openshift-apps/coreos-koji-tagger.yml b/playbooks/openshift-apps/coreos-koji-tagger.yml index b2e091abe3..0a35581342 100644 --- a/playbooks/openshift-apps/coreos-koji-tagger.yml +++ b/playbooks/openshift-apps/coreos-koji-tagger.yml @@ -50,9 +50,9 @@ object_objectname: buildconfig.yml - role: openshift/start-build - app: coreos-koji-tagger - buildname: coreos-koji-tagger-build - objectname: coreos-koji-tagger-build + start_build_app: coreos-koji-tagger + start_build_buildname: coreos-koji-tagger-build + start_build_objectname: coreos-koji-tagger-build - role: openshift/object object_app: coreos-koji-tagger diff --git a/playbooks/openshift-apps/datagrepper.yml b/playbooks/openshift-apps/datagrepper.yml index 16139159a2..d76d0f5e39 100644 --- a/playbooks/openshift-apps/datagrepper.yml +++ b/playbooks/openshift-apps/datagrepper.yml @@ -101,8 +101,8 @@ object_objectname: deploymentconfig.yml # - role: openshift/start-build - # app: datagrepper - # buildname: datagrepper + # start_build_app: datagrepper + # start_build_buildname: datagrepper # - role: openshift/rollout # rollout_app: datagrepper diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index d137e006ea..02c80241a0 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -72,8 +72,8 @@ object_objectname: deploymentconfig.yml # - role: openshift/start-build - # app: discourse2fedmsg - # buildname: discourse2fedmsg + # start_build_app: discourse2fedmsg + # start_build_buildname: discourse2fedmsg # tags: # - never # - build diff --git a/playbooks/openshift-apps/docsbuilding.yml b/playbooks/openshift-apps/docsbuilding.yml index 5625d024c9..0e15cf218d 100644 --- a/playbooks/openshift-apps/docsbuilding.yml +++ b/playbooks/openshift-apps/docsbuilding.yml @@ -38,8 +38,8 @@ object_template: buildconfig.yml - role: openshift/start-build - app: docsbuilding - buildname: builder-build + start_build_app: docsbuilding + start_build_buildname: builder-build - role: openshift/object object_app: docsbuilding diff --git a/playbooks/openshift-apps/docstranslation.yml b/playbooks/openshift-apps/docstranslation.yml index 48a95a0e90..dacf892da3 100644 --- a/playbooks/openshift-apps/docstranslation.yml +++ b/playbooks/openshift-apps/docstranslation.yml @@ -43,7 +43,7 @@ ansible.builtin.include_role: name: openshift/start-build vars: - buildname: docstranslation-build + start_build_buildname: docstranslation-build - name: Define secrets ansible.builtin.include_role: diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index ab0eeda555..8557947d07 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -93,9 +93,9 @@ object_objectname: configmap.yml - role: openshift/start-build - app: elections - buildname: elections-build - objectname: elections-build + start_build_app: elections + start_build_buildname: elections-build + start_build_objectname: elections-build - role: openshift/object object_app: elections diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index f5bf5d630a..9469ed5cc9 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/playbooks/openshift-apps/fasjson.yml @@ -111,8 +111,8 @@ object_objectname: deploymentconfig.yml # - role: openshift/start-build - # app: fasjson - # buildname: fasjson + # start_build_app: fasjson + # start_build_buildname: fasjson # - role: openshift/rollout # rollout_app: noggin diff --git a/playbooks/openshift-apps/fedocal.yml b/playbooks/openshift-apps/fedocal.yml index 71d42f86d8..28a3a47b9c 100644 --- a/playbooks/openshift-apps/fedocal.yml +++ b/playbooks/openshift-apps/fedocal.yml @@ -59,9 +59,9 @@ object_objectname: configmap.yml - role: openshift/start-build - app: fedocal - buildname: fedocal-build - objectname: fedocal-build + start_build_app: fedocal + start_build_buildname: fedocal-build + start_build_objectname: fedocal-build - role: openshift/object object_app: fedocal diff --git a/playbooks/openshift-apps/fedora-packages-static.yml b/playbooks/openshift-apps/fedora-packages-static.yml index 2d14501560..4e5b00f06a 100644 --- a/playbooks/openshift-apps/fedora-packages-static.yml +++ b/playbooks/openshift-apps/fedora-packages-static.yml @@ -38,9 +38,9 @@ object_objectname: configmap.yml - role: openshift/start-build - app: fedora-packages-static - buildname: fedora-packages-static-build - objectname: fedora-packages-static-build + start_build_app: fedora-packages-static + start_build_buildname: fedora-packages-static-build + start_build_objectname: fedora-packages-static-build - role: openshift/object object_app: fedora-packages-static diff --git a/playbooks/openshift-apps/flatpak-indexer.yml b/playbooks/openshift-apps/flatpak-indexer.yml index 69b292dd18..90b8ffda5d 100644 --- a/playbooks/openshift-apps/flatpak-indexer.yml +++ b/playbooks/openshift-apps/flatpak-indexer.yml @@ -45,9 +45,9 @@ object_objectname: configmap.yml - role: openshift/start-build - app: flatpak-indexer + start_build_app: flatpak-indexer # This will trigger the main build via a imageChange trigger - buildname: flatpak-indexer-tardiff-build + start_build_buildname: flatpak-indexer-tardiff-build - role: openshift/object object_app: flatpak-indexer diff --git a/playbooks/openshift-apps/kanban.yml b/playbooks/openshift-apps/kanban.yml index 7329ca1478..4346f9b9c5 100644 --- a/playbooks/openshift-apps/kanban.yml +++ b/playbooks/openshift-apps/kanban.yml @@ -124,6 +124,6 @@ route_servicename: kanban-web - role: openshift/start-build - app: kanban - buildname: kanban-build - objectname: kanban-build + start_build_app: kanban + start_build_buildname: kanban-build + start_build_objectname: kanban-build diff --git a/playbooks/openshift-apps/languages.yml b/playbooks/openshift-apps/languages.yml index a158de78f8..15e4fbdc04 100644 --- a/playbooks/openshift-apps/languages.yml +++ b/playbooks/openshift-apps/languages.yml @@ -28,8 +28,8 @@ object_template: buildconfig.yml - role: openshift/start-build - app: languages - buildname: build-latest + start_build_app: languages + start_build_buildname: build-latest - role: openshift/object object_app: languages diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml index 1c94f13e28..e782080c0d 100644 --- a/playbooks/openshift-apps/maubot.yml +++ b/playbooks/openshift-apps/maubot.yml @@ -91,9 +91,9 @@ secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/start-build - app: maubot - buildname: maubot-build - objectname: maubot-build + start_build_app: maubot + start_build_buildname: maubot-build + start_build_objectname: maubot-build - role: openshift/object object_app: maubot diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml index cf0a029dd4..01248d565d 100644 --- a/playbooks/openshift-apps/mdapi.yml +++ b/playbooks/openshift-apps/mdapi.yml @@ -67,9 +67,9 @@ - cron-job - role: openshift/start-build - app: mdapi - buildname: mdapi-build - objectname: mdapi-build + start_build_app: mdapi + start_build_buildname: mdapi-build + start_build_objectname: mdapi-build - role: openshift/object object_app: mdapi diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index bfa85e0b73..496b9e14b0 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -132,8 +132,8 @@ object_objectname: buildconfig.yml - role: openshift/start-build - app: messaging-bridges - buildname: messaging-bridges-build + start_build_app: messaging-bridges + start_build_buildname: messaging-bridges-build - role: openshift/object object_app: messaging-bridges diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index c3cf906740..71f37be690 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -165,8 +165,8 @@ object_objectname: cron-primary-mirror.yml - role: openshift/start-build - app: mirrormanager - buildname: mm + start_build_app: mirrormanager + start_build_buildname: mm tags: - never - build diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml index 836e1e1a52..009cd0d423 100644 --- a/playbooks/openshift-apps/monitor_gating.yml +++ b/playbooks/openshift-apps/monitor_gating.yml @@ -80,9 +80,9 @@ object_objectname: deploymentconfig.yml - role: openshift/start-build - app: monitor-gating - buildname: monitor-gating-build - objectname: monitor-gating-build + start_build_app: monitor-gating + start_build_buildname: monitor-gating-build + start_build_objectname: monitor-gating-build tags: - build diff --git a/playbooks/openshift-apps/mote.yml b/playbooks/openshift-apps/mote.yml index a697f06a3c..41bd640051 100644 --- a/playbooks/openshift-apps/mote.yml +++ b/playbooks/openshift-apps/mote.yml @@ -80,8 +80,9 @@ haproxy.router.openshift.io/set-forwarded-headers: append - role: openshift/start-build - buildname: mote - objectname: mote + start_build_app: mote + start_build_buildname: mote + start_build_objectname: mote # ############################################### diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index 9c82bb0d5f..934252ad9c 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -107,8 +107,8 @@ object_objectname: deploymentconfig.yml - role: openshift/start-build - app: noggin-centos - buildname: noggin + start_build_app: noggin-centos + start_build_buildname: noggin tags: - never - build diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index ecf57789f1..5395804ed8 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -102,8 +102,8 @@ object_objectname: deploymentconfig.yml - role: openshift/start-build - app: noggin - buildname: noggin + start_build_app: noggin + start_build_buildname: noggin tags: - never - build diff --git a/playbooks/openshift-apps/openvpn.yml b/playbooks/openshift-apps/openvpn.yml index d3e3800e91..274704643a 100644 --- a/playbooks/openshift-apps/openvpn.yml +++ b/playbooks/openshift-apps/openvpn.yml @@ -59,7 +59,8 @@ object_objectname: deployment.yml - role: openshift/start-build - buildname: openvpn + start_build_app: openvpn + start_build_buildname: openvpn ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index be3e5f0c91..04ec71c92e 100644 --- a/playbooks/openshift-apps/oraculum.yml +++ b/playbooks/openshift-apps/oraculum.yml @@ -123,6 +123,6 @@ haproxy.router.openshift.io/set-forwarded-headers: append - role: openshift/start-build - app: oraculum - buildname: packager-dashboard-build - objectname: packager-dashboard-build + start_build_app: oraculum + start_build_buildname: packager-dashboard-build + start_build_objectname: packager-dashboard-build diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index a401894aa3..45c393bc0e 100644 --- a/playbooks/openshift-apps/release-monitoring.yml +++ b/playbooks/openshift-apps/release-monitoring.yml @@ -43,8 +43,8 @@ object_template: buildconfig.yml object_objectname: buildconfig.yml - role: openshift/start-build - app: release-monitoring - buildname: release-monitoring-web-build + start_build_app: release-monitoring + start_build_buildname: release-monitoring-web-build - role: openshift/object object_app: release-monitoring object_template: configmap.yml diff --git a/playbooks/openshift-apps/review-stats.yml b/playbooks/openshift-apps/review-stats.yml index 84082bd70f..a4b1744942 100644 --- a/playbooks/openshift-apps/review-stats.yml +++ b/playbooks/openshift-apps/review-stats.yml @@ -34,8 +34,8 @@ object_template: pvc.yml object_objectname: pvc.yml - role: openshift/start-build - app: review-stats - buildname: builder-build + start_build_app: review-stats + start_build_buildname: builder-build - role: openshift/object object_app: review-stats object_template: cron.yml diff --git a/playbooks/openshift-apps/testdays.yml b/playbooks/openshift-apps/testdays.yml index 9594cfb2f2..d8f280a573 100644 --- a/playbooks/openshift-apps/testdays.yml +++ b/playbooks/openshift-apps/testdays.yml @@ -100,6 +100,6 @@ route_servicename: testdays - role: openshift/start-build - app: testdays - buildname: testdays-build - objectname: testdays-build + start_build_app: testdays + start_build_buildname: testdays-build + start_build_objectname: testdays-build diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml index 1113cf61db..9d1d7533b2 100644 --- a/playbooks/openshift-apps/the-new-hotness.yml +++ b/playbooks/openshift-apps/the-new-hotness.yml @@ -84,9 +84,9 @@ object_objectname: configmap.yml - role: openshift/start-build - app: the-new-hotness - buildname: the-new-hotness-build - objectname: the-new-hotness-build + start_build_app: the-new-hotness + start_build_buildname: the-new-hotness-build + start_build_objectname: the-new-hotness-build - role: openshift/object object_app: the-new-hotness diff --git a/playbooks/openshift-apps/toddlers.yml b/playbooks/openshift-apps/toddlers.yml index 5fb17ab98b..dddf3f67e4 100644 --- a/playbooks/openshift-apps/toddlers.yml +++ b/playbooks/openshift-apps/toddlers.yml @@ -115,6 +115,6 @@ object_objectname: imagestream.yml - role: openshift/start-build - app: toddlers - buildname: toddlers-build - objectname: toddlers-build + start_build_app: toddlers + start_build_buildname: toddlers-build + start_build_objectname: toddlers-build diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml index d379a870c5..2cedee18ff 100644 --- a/playbooks/openshift-apps/transtats.yml +++ b/playbooks/openshift-apps/transtats.yml @@ -27,8 +27,8 @@ object_template: buildconfig.yml object_objectname: buildconfig.yml - role: openshift/start-build - app: transtats - buildname: transtats-build + start_build_app: transtats + start_build_buildname: transtats-build - role: openshift/object object_app: transtats object_file: service.yml diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index d117abf21e..b1751ba0d2 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/playbooks/openshift-apps/webhook2fedmsg.yml @@ -114,8 +114,8 @@ object_objectname: deploymentconfig.yml # - role: openshift/start-build - # app: webhook2fedmsg - # buildname: webhook2fedmsg + # start_build_app: webhook2fedmsg + # start_build_buildname: webhook2fedmsg # tags: # - never # - build diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml index fcd82bf98e..b8cbbdbb32 100644 --- a/playbooks/openshift-apps/websites.yml +++ b/playbooks/openshift-apps/websites.yml @@ -36,9 +36,9 @@ object_objectname: fedora-websites-bc.yml - role: openshift/start-build - app: websites - buildname: fedora-websites - objectname: fedora-websites + start_build_app: websites + start_build_buildname: fedora-websites + start_build_objectname: fedora-websites - role: openshift/object object_app: websites @@ -56,9 +56,9 @@ object_objectname: buildconfig.yml - role: openshift/start-build - app: websites - buildname: websites-build - objectname: websites-build + start_build_app: websites + start_build_buildname: websites-build + start_build_objectname: websites-build - role: openshift/object object_app: websites diff --git a/playbooks/openshift-apps/zezere.yml b/playbooks/openshift-apps/zezere.yml index 63aabeb505..ebfb425fe6 100644 --- a/playbooks/openshift-apps/zezere.yml +++ b/playbooks/openshift-apps/zezere.yml @@ -23,8 +23,8 @@ object_objectname: buildconfig.yml object_file: buildconfig.yml - role: openshift/start-build - app: zezere - buildname: zezere-build + start_build_app: zezere + start_build_buildname: zezere-build - role: openshift/object object_app: zezere object_file: service.yml diff --git a/roles/openshift/start-build/tasks/main.yml b/roles/openshift/start-build/tasks/main.yml index e746067c7a..5b8bc86793 100644 --- a/roles/openshift/start-build/tasks/main.yml +++ b/roles/openshift/start-build/tasks/main.yml @@ -1,3 +1,3 @@ --- - name: Run `oc start-build` - shell: oc -n {{app}} start-build {{buildname}} + shell: oc -n {{start_build_app}} start-build {{start_build_buildname}}