From bf48fbae492ab559f4397c103e21cb91fb13f5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?El=C5=91d=20Ill=C3=A9s?= <elod.illes@est.tech>
Date: Tue, 11 May 2021 17:08:50 +0200
Subject: [PATCH] [kolla] Transition Train to EM

This transition the train 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: I227190c07435dc0bd755acf8c848d51ff5dbd7ee
---
 deliverables/train/kayobe.yaml        | 8 ++++++++
 deliverables/train/kolla-ansible.yaml | 4 ++++
 deliverables/train/kolla-cli.yaml     | 4 ++++
 deliverables/train/kolla.yaml         | 4 ++++
 4 files changed, 20 insertions(+)

diff --git a/deliverables/train/kayobe.yaml b/deliverables/train/kayobe.yaml
index 5f9ef66ecb..8ff32aa635 100644
--- a/deliverables/train/kayobe.yaml
+++ b/deliverables/train/kayobe.yaml
@@ -65,4 +65,12 @@ releases:
         hash: fa9b73a54d22955ffbd132bb37fedfd69b985538
       - repo: openstack/kayobe-config-dev
         hash: 9d3bbef893730ff7d65a325ed30986f01df78bb0
+  - version: train-em
+    projects:
+      - repo: openstack/kayobe
+        hash: de5fa9ac0bd17a5e1140cb7725d4e7d3841d74f5
+      - repo: openstack/kayobe-config
+        hash: fa9b73a54d22955ffbd132bb37fedfd69b985538
+      - repo: openstack/kayobe-config-dev
+        hash: 9d3bbef893730ff7d65a325ed30986f01df78bb0
 release-notes: https://docs.openstack.org/releasenotes/kayobe/train.html
diff --git a/deliverables/train/kolla-ansible.yaml b/deliverables/train/kolla-ansible.yaml
index a2f8fc6dac..18001f245d 100644
--- a/deliverables/train/kolla-ansible.yaml
+++ b/deliverables/train/kolla-ansible.yaml
@@ -49,4 +49,8 @@ releases:
     projects:
       - repo: openstack/kolla-ansible
         hash: 3a1b9470584fa3644be15d933de399472ac64812
+  - version: train-em
+    projects:
+      - repo: openstack/kolla-ansible
+        hash: 3a1b9470584fa3644be15d933de399472ac64812
 release-notes: https://docs.openstack.org/releasenotes/kolla-ansible/train.html
diff --git a/deliverables/train/kolla-cli.yaml b/deliverables/train/kolla-cli.yaml
index 3d6dafeb11..d8bd3648db 100644
--- a/deliverables/train/kolla-cli.yaml
+++ b/deliverables/train/kolla-cli.yaml
@@ -17,3 +17,7 @@ releases:
       - hash: 2fdd3889442d1f0e78199ecf7be3cd36bff645af
         repo: openstack/kolla-cli
     version: 9.0.0
+  - version: train-em
+    projects:
+      - repo: openstack/kolla-cli
+        hash: 2fdd3889442d1f0e78199ecf7be3cd36bff645af
diff --git a/deliverables/train/kolla.yaml b/deliverables/train/kolla.yaml
index 121f873ca8..d417ffd2bb 100644
--- a/deliverables/train/kolla.yaml
+++ b/deliverables/train/kolla.yaml
@@ -49,6 +49,10 @@ releases:
     projects:
       - repo: openstack/kolla
         hash: fa53a60c149026ff6641e1e1d9bae240dd888f3d
+  - version: train-em
+    projects:
+      - repo: openstack/kolla
+        hash: fa53a60c149026ff6641e1e1d9bae240dd888f3d
 cycle-highlights:
   - Switched to Python 3 in Debian and Ubuntu source images.
   - Introduced images and playbooks for Masakari, which supports instance