From 256a7e7c17ec52152df2cc84952b9dd319dfd588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= Date: Thu, 11 Nov 2021 18:38:01 +0100 Subject: [PATCH] [tripleo] Transition Ussuri to EM This transition the ussuri branch to extended maintenance. Changes for bugfixes and things the team deems important are still encouraged, but there will no longer be official releases off of the branch. Please +1 if the team is ready for us to proceed with this transition, or -1 if there are any final backports currently in flight that we should wait for. For the latter case, please update the patch with the new commit hash after doing a final release to get those changes out so we know to proceed with the transition. Change-Id: Ic6d4b4841862b8bbc5a9a5e5b28dbdc39de16970 --- deliverables/ussuri/os-apply-config.yaml | 4 ++++ deliverables/ussuri/os-collect-config.yaml | 4 ++++ deliverables/ussuri/os-net-config.yaml | 4 ++++ deliverables/ussuri/os-refresh-config.yaml | 4 ++++ deliverables/ussuri/paunch.yaml | 4 ++++ deliverables/ussuri/puppet-tripleo.yaml | 4 ++++ deliverables/ussuri/python-tripleoclient.yaml | 4 ++++ deliverables/ussuri/tripleo-ansible.yaml | 4 ++++ deliverables/ussuri/tripleo-common.yaml | 4 ++++ deliverables/ussuri/tripleo-heat-templates.yaml | 4 ++++ deliverables/ussuri/tripleo-image-elements.yaml | 4 ++++ deliverables/ussuri/tripleo-ipsec.yaml | 4 ++++ deliverables/ussuri/tripleo-puppet-elements.yaml | 4 ++++ deliverables/ussuri/tripleo-validations.yaml | 4 ++++ 14 files changed, 56 insertions(+) diff --git a/deliverables/ussuri/os-apply-config.yaml b/deliverables/ussuri/os-apply-config.yaml index 6eb6a7125a..dd287349c7 100644 --- a/deliverables/ussuri/os-apply-config.yaml +++ b/deliverables/ussuri/os-apply-config.yaml @@ -31,6 +31,10 @@ releases: projects: - repo: openstack/os-apply-config hash: 910348f934ed38497a5e3c284da0a86c5f077a1c + - version: ussuri-em + projects: + - repo: openstack/os-apply-config + hash: 910348f934ed38497a5e3c284da0a86c5f077a1c branches: - location: 11.2.0 name: stable/ussuri diff --git a/deliverables/ussuri/os-collect-config.yaml b/deliverables/ussuri/os-collect-config.yaml index 479359e7be..fb1cf7af4d 100644 --- a/deliverables/ussuri/os-collect-config.yaml +++ b/deliverables/ussuri/os-collect-config.yaml @@ -27,6 +27,10 @@ releases: projects: - repo: openstack/os-collect-config hash: 1bdb36136a052dddc3299c2775916aeb6ad3648b + - version: ussuri-em + projects: + - repo: openstack/os-collect-config + hash: 1bdb36136a052dddc3299c2775916aeb6ad3648b branches: - name: stable/ussuri location: 11.0.2 diff --git a/deliverables/ussuri/os-net-config.yaml b/deliverables/ussuri/os-net-config.yaml index fba3e5ec41..b1dd5f1110 100644 --- a/deliverables/ussuri/os-net-config.yaml +++ b/deliverables/ussuri/os-net-config.yaml @@ -47,6 +47,10 @@ releases: projects: - repo: openstack/os-net-config hash: 3ebf87b434a77e9d37c7d4324dda804c5418e6bc + - version: ussuri-em + projects: + - repo: openstack/os-net-config + hash: 3ebf87b434a77e9d37c7d4324dda804c5418e6bc branches: - location: 12.3.0 name: stable/ussuri diff --git a/deliverables/ussuri/os-refresh-config.yaml b/deliverables/ussuri/os-refresh-config.yaml index b118e368b8..3f89dea97a 100644 --- a/deliverables/ussuri/os-refresh-config.yaml +++ b/deliverables/ussuri/os-refresh-config.yaml @@ -15,6 +15,10 @@ releases: projects: - repo: openstack/os-refresh-config hash: 2790bcc985cf87a540870d54179077f7300904da + - version: ussuri-em + projects: + - repo: openstack/os-refresh-config + hash: 2790bcc985cf87a540870d54179077f7300904da branches: - name: stable/ussuri location: 11.0.0 diff --git a/deliverables/ussuri/paunch.yaml b/deliverables/ussuri/paunch.yaml index c1c4c600d8..7b31977e35 100644 --- a/deliverables/ussuri/paunch.yaml +++ b/deliverables/ussuri/paunch.yaml @@ -39,6 +39,10 @@ releases: projects: - repo: openstack/paunch hash: d89f5697b9be76a214b920452d7ef0bd6248a3ac + - version: ussuri-em + projects: + - repo: openstack/paunch + hash: d89f5697b9be76a214b920452d7ef0bd6248a3ac branches: - location: 7.0.0 name: stable/ussuri diff --git a/deliverables/ussuri/puppet-tripleo.yaml b/deliverables/ussuri/puppet-tripleo.yaml index d3edd0ecdf..bea96e6bc0 100644 --- a/deliverables/ussuri/puppet-tripleo.yaml +++ b/deliverables/ussuri/puppet-tripleo.yaml @@ -50,6 +50,10 @@ releases: projects: - repo: openstack/puppet-tripleo hash: 8cfa8bea3d4f7ca5cf6c4a53a42b9d9a32531d4f + - version: ussuri-em + projects: + - repo: openstack/puppet-tripleo + hash: 8cfa8bea3d4f7ca5cf6c4a53a42b9d9a32531d4f branches: - location: 12.3.0 name: stable/ussuri diff --git a/deliverables/ussuri/python-tripleoclient.yaml b/deliverables/ussuri/python-tripleoclient.yaml index 83c8f2626c..4e3cb21c63 100644 --- a/deliverables/ussuri/python-tripleoclient.yaml +++ b/deliverables/ussuri/python-tripleoclient.yaml @@ -51,6 +51,10 @@ releases: projects: - repo: openstack/python-tripleoclient hash: 2f54f40f64c8d718369f194526f477d9f70000fe + - version: ussuri-em + projects: + - repo: openstack/python-tripleoclient + hash: 2f54f40f64c8d718369f194526f477d9f70000fe branches: - location: 13.3.0 name: stable/ussuri diff --git a/deliverables/ussuri/tripleo-ansible.yaml b/deliverables/ussuri/tripleo-ansible.yaml index bc823e9ec5..fc69669fb5 100644 --- a/deliverables/ussuri/tripleo-ansible.yaml +++ b/deliverables/ussuri/tripleo-ansible.yaml @@ -55,6 +55,10 @@ releases: projects: - repo: openstack/tripleo-ansible hash: 3f118a395aa2122f536f95b939a3cc6d0d106ca0 + - version: ussuri-em + projects: + - repo: openstack/tripleo-ansible + hash: 3f118a395aa2122f536f95b939a3cc6d0d106ca0 branches: - location: 1.4.0 name: stable/ussuri diff --git a/deliverables/ussuri/tripleo-common.yaml b/deliverables/ussuri/tripleo-common.yaml index 5aeea50c79..bdf37058e5 100644 --- a/deliverables/ussuri/tripleo-common.yaml +++ b/deliverables/ussuri/tripleo-common.yaml @@ -55,6 +55,10 @@ releases: projects: - repo: openstack/tripleo-common hash: 10b421198ebdd53dbc07e03deb258e519723cbd2 + - version: ussuri-em + projects: + - repo: openstack/tripleo-common + hash: 10b421198ebdd53dbc07e03deb258e519723cbd2 branches: - location: 12.4.0 name: stable/ussuri diff --git a/deliverables/ussuri/tripleo-heat-templates.yaml b/deliverables/ussuri/tripleo-heat-templates.yaml index 40ff38f469..2fe7c6a402 100644 --- a/deliverables/ussuri/tripleo-heat-templates.yaml +++ b/deliverables/ussuri/tripleo-heat-templates.yaml @@ -51,6 +51,10 @@ releases: projects: - repo: openstack/tripleo-heat-templates hash: a01ad35fb93b8f966ea9cbdd0b3e83d74c902795 + - version: ussuri-em + projects: + - repo: openstack/tripleo-heat-templates + hash: a01ad35fb93b8f966ea9cbdd0b3e83d74c902795 branches: - location: 12.3.0 name: stable/ussuri diff --git a/deliverables/ussuri/tripleo-image-elements.yaml b/deliverables/ussuri/tripleo-image-elements.yaml index 51c7a98b86..f5cd0933bb 100644 --- a/deliverables/ussuri/tripleo-image-elements.yaml +++ b/deliverables/ussuri/tripleo-image-elements.yaml @@ -31,6 +31,10 @@ releases: projects: - repo: openstack/tripleo-image-elements hash: 8ff41f23cac05d0b7ba4a731d34b9b2690ba5aa5 + - version: ussuri-em + projects: + - repo: openstack/tripleo-image-elements + hash: 8ff41f23cac05d0b7ba4a731d34b9b2690ba5aa5 branches: - location: 12.0.0 name: stable/ussuri diff --git a/deliverables/ussuri/tripleo-ipsec.yaml b/deliverables/ussuri/tripleo-ipsec.yaml index b92ef7b451..992c48da9f 100644 --- a/deliverables/ussuri/tripleo-ipsec.yaml +++ b/deliverables/ussuri/tripleo-ipsec.yaml @@ -19,6 +19,10 @@ releases: projects: - repo: openstack/tripleo-ipsec hash: d9666d8900f90ef79d704478dde622b09b8ccfd1 + - version: ussuri-em + projects: + - repo: openstack/tripleo-ipsec + hash: d9666d8900f90ef79d704478dde622b09b8ccfd1 branches: - name: stable/ussuri location: 9.3.1 diff --git a/deliverables/ussuri/tripleo-puppet-elements.yaml b/deliverables/ussuri/tripleo-puppet-elements.yaml index e730e8029b..2d4a290024 100644 --- a/deliverables/ussuri/tripleo-puppet-elements.yaml +++ b/deliverables/ussuri/tripleo-puppet-elements.yaml @@ -39,6 +39,10 @@ releases: projects: - repo: openstack/tripleo-puppet-elements hash: bf4725d2b1dde7cb90edba8ebf9ffd3565dbdd70 + - version: ussuri-em + projects: + - repo: openstack/tripleo-puppet-elements + hash: bf4725d2b1dde7cb90edba8ebf9ffd3565dbdd70 branches: - location: 12.3.0 name: stable/ussuri diff --git a/deliverables/ussuri/tripleo-validations.yaml b/deliverables/ussuri/tripleo-validations.yaml index a811b366f2..c4ce5d28ad 100644 --- a/deliverables/ussuri/tripleo-validations.yaml +++ b/deliverables/ussuri/tripleo-validations.yaml @@ -47,6 +47,10 @@ releases: projects: - repo: openstack/tripleo-validations hash: c1ec034b6ab39833e973947d17194a6ccfdc39a7 + - version: ussuri-em + projects: + - repo: openstack/tripleo-validations + hash: c1ec034b6ab39833e973947d17194a6ccfdc39a7 branches: - location: 12.3.0 name: stable/ussuri