From e96978a74ad7bac2175cd1b4069b07c6f3641133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 4 May 2021 16:27:11 +0200 Subject: [PATCH] ironic-python-agent-builder release model change During the recent xena ptg, the ironic community had a discussion about the need to move the ironic-python-agent-builder project from an independent model to the standard release model. When we initially split the builder from ironic-python-agent, we decided against it, but considering some problems we encountered during the road, the ironic community seems to be in favor of the change. The reasons for this are mainly to strictly align the image building project to ironic-python-agent releases, and ease dealing with the occasional upgrade of tinycore linux, the base image used to build the "tinyipa" ironic-python-agent ramdisk. We decided to split them at some point, and we'd like to keep them separated, but we realized that it would make sense to keep them synced by branch. The ironic contributor suffered CI pain over the past year where code handling distributions has broken several times. Largely these breaks have had to be navigated around with specific version pinning, and settings changes, because we were unable to fix something a release or two back inside the tooling, in this case ironic-python-agent-builder. In other words, if the ironic team had that capability and those branches/tags, we would have been less in a world of pain because we wouldn't have had to make changes on every job/branch across every repository where we were hitting issues with ipa-b. Reduction of pain is why this change is being proposed. We should also notice that the Kolla team also use ipa-builder and they faced similar issues with Kayobe. These changes propose to cut ipa-builder for Wallaby in a retro active manner (Wallaby is already out at this point). These changes use the same model that the one used by ironic-python-agent. These changes create a new tag (2.7.0) based on the same hash that the previous independent version (2.6.0), mostly to properly init the series with a meaningful version number, avoid misleading with future bugfix releases versionned with a minor bump, create the wallaby branch from the right point, avoid errors with our tooling related to missing tags for a series. These changes also init ipa-builder for Xena. http://lists.openstack.org/pipermail/openstack-discuss/2021-April/022032.html Change-Id: Ia899b39dbc68b245e1b84518363de5420af500c0 --- .../ironic-python-agent-builder.yaml | 43 ------------------- .../wallaby/ironic-python-agent-builder.yaml | 17 ++++++++ .../xena/ironic-python-agent-builder.yaml | 9 ++++ 3 files changed, 26 insertions(+), 43 deletions(-) delete mode 100644 deliverables/_independent/ironic-python-agent-builder.yaml create mode 100644 deliverables/wallaby/ironic-python-agent-builder.yaml create mode 100644 deliverables/xena/ironic-python-agent-builder.yaml diff --git a/deliverables/_independent/ironic-python-agent-builder.yaml b/deliverables/_independent/ironic-python-agent-builder.yaml deleted file mode 100644 index 221dde72f3..0000000000 --- a/deliverables/_independent/ironic-python-agent-builder.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -storyboard: openstack/ironic-python-agent-builder -team: ironic -type: other -releases: - - version: 1.0.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: de8e8e62ff31b70fdf2aca59fcdff9f81951a05c - - projects: - - hash: f9ec4c5d164fba489689ab49f349f91c1f73af6f - repo: openstack/ironic-python-agent-builder - version: 1.1.0 - - version: 2.0.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: dd90f32dfee6b59f5ab30516f4da11b848955d23 - - version: 2.1.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: a28b8fa5bc49bf8452c5e8f8fdf39f5f09e46ff2 - - version: 2.2.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: 69e41ff7618ff719fc5182471a84f9fd4705e19c - - version: 2.3.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: 5e72595a736f35d8edc0e2edf4e51d5191e257d5 - - version: 2.4.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: 00b8cbbf04ec63bf0c6ad6c1530dd7ea7f59645c - - version: 2.5.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: 863735c202c1a5a32513635ce7f0b65675253751 - - version: 2.6.0 - projects: - - repo: openstack/ironic-python-agent-builder - hash: 93292bfd5740dda108da40dc960940c9b7502ffe -repository-settings: - openstack/ironic-python-agent-builder: {} diff --git a/deliverables/wallaby/ironic-python-agent-builder.yaml b/deliverables/wallaby/ironic-python-agent-builder.yaml new file mode 100644 index 0000000000..32b111e578 --- /dev/null +++ b/deliverables/wallaby/ironic-python-agent-builder.yaml @@ -0,0 +1,17 @@ +--- +storyboard: openstack/ironic-python-agent-builder +release-model: cycle-with-intermediary +stable-branch-type: std-with-versions +release-type: python-pypi +team: ironic +type: other +repository-settings: + openstack/ironic-python-agent-builder: {} +releases: + - version: 2.7.0 + projects: + - repo: openstack/ironic-python-agent-builder + hash: 93292bfd5740dda108da40dc960940c9b7502ffe +branches: + - name: stable/wallaby + location: 2.7.0 diff --git a/deliverables/xena/ironic-python-agent-builder.yaml b/deliverables/xena/ironic-python-agent-builder.yaml new file mode 100644 index 0000000000..dc66a387ad --- /dev/null +++ b/deliverables/xena/ironic-python-agent-builder.yaml @@ -0,0 +1,9 @@ +--- +storyboard: openstack/ironic-python-agent-builder +release-model: cycle-with-intermediary +stable-branch-type: std-with-versions +release-type: python-pypi +team: ironic +type: other +repository-settings: + openstack/ironic-python-agent-builder: {}