Merge "[tripleo] Transition Rocky to EM"

2020-03-19 22:20:18 +00:00 · 2020-03-19 22:20:18 +00:00 · f7dfd832c5
commit f7dfd832c5
parent e8f2fcf047 b0b5b672a5
17 changed files with 64 additions and 9 deletions
--- a/deliverables/rocky/instack-undercloud.yaml
+++ b/deliverables/rocky/instack-undercloud.yaml
@ -35,6 +35,10 @@ releases:
    projects:
      - repo: openstack/instack-undercloud
        hash: 5f1b6c6e5001ed917d474bed33ca88103031de94
+  - version: rocky-em
+    projects:
+      - repo: openstack/instack-undercloud
+        hash: 5f1b6c6e5001ed917d474bed33ca88103031de94
 branches:
  - location: 9.3.0
    name: stable/rocky
--- a/deliverables/rocky/instack.yaml
+++ b/deliverables/rocky/instack.yaml
@ -15,6 +15,10 @@ releases:
      - hash: 1dca54c838b759eab1ae7c49871e2bba85dae06c
        repo: openstack/instack
    version: 9.1.0
+  - version: rocky-em
+    projects:
+      - repo: openstack/instack
+        hash: 1dca54c838b759eab1ae7c49871e2bba85dae06c
 branches:
  - location: 9.1.0
    name: stable/rocky
--- a/deliverables/rocky/os-apply-config.yaml
+++ b/deliverables/rocky/os-apply-config.yaml
@ -23,6 +23,10 @@ releases:
      - hash: 07165a907a01408485526950739183a6154f6515
        repo: openstack/os-apply-config
    version: 9.1.2
+  - version: rocky-em
+    projects:
+      - repo: openstack/os-apply-config
+        hash: 07165a907a01408485526950739183a6154f6515
 branches:
  - location: 9.1.0
    name: stable/rocky
--- a/deliverables/rocky/os-collect-config.yaml
+++ b/deliverables/rocky/os-collect-config.yaml
@ -23,6 +23,10 @@ releases:
      - hash: f63f4d2dc8e6de98edee861642eb2c204800f7cf
        repo: openstack/os-collect-config
    version: 9.2.1
+  - version: rocky-em
+    projects:
+      - repo: openstack/os-collect-config
+        hash: f63f4d2dc8e6de98edee861642eb2c204800f7cf
 branches:
  - location: 9.2.0
    name: stable/rocky
--- a/deliverables/rocky/os-net-config.yaml
+++ b/deliverables/rocky/os-net-config.yaml
@ -31,6 +31,10 @@ releases:
    projects:
      - repo: openstack/os-net-config
        hash: 92a3500b5fc9ae458b71e934e523be4fabe97100
+  - version: rocky-em
+    projects:
+      - repo: openstack/os-net-config
+        hash: 92a3500b5fc9ae458b71e934e523be4fabe97100
 branches:
  - location: 9.2.0
    name: stable/rocky
--- a/deliverables/rocky/os-refresh-config.yaml
+++ b/deliverables/rocky/os-refresh-config.yaml
@ -19,6 +19,10 @@ releases:
      - hash: a1dad6998dd4cbb1d3cd34afe21cd5923b61e323
        repo: openstack/os-refresh-config
    version: 9.1.1
+  - version: rocky-em
+    projects:
+      - repo: openstack/os-refresh-config
+        hash: a1dad6998dd4cbb1d3cd34afe21cd5923b61e323
 branches:
  - location: 9.1.0
    name: stable/rocky
--- a/deliverables/rocky/paunch.yaml
+++ b/deliverables/rocky/paunch.yaml
@ -25,6 +25,10 @@ releases:
    projects:
      - repo: openstack/paunch
        hash: b87a7bd445caf38b1d74606f024e5018114753dd
+  - version: rocky-em
+    projects:
+      - repo: openstack/paunch
+        hash: b87a7bd445caf38b1d74606f024e5018114753dd
 repository-settings:
  openstack/paunch: {}
 branches:
--- a/deliverables/rocky/puppet-tripleo.yaml
+++ b/deliverables/rocky/puppet-tripleo.yaml
@ -34,6 +34,10 @@ releases:
    projects:
      - repo: openstack/puppet-tripleo
        hash: baed6f110ef0c946d85c059802953a0f06bbae0c
+  - version: rocky-em
+    projects:
+      - repo: openstack/puppet-tripleo
+        hash: baed6f110ef0c946d85c059802953a0f06bbae0c
 branches:
  - location: 9.3.0
    name: stable/rocky
--- a/deliverables/rocky/python-tripleoclient.yaml
+++ b/deliverables/rocky/python-tripleoclient.yaml
@ -47,6 +47,10 @@ releases:
    projects:
      - repo: openstack/python-tripleoclient
        hash: 934711db2bc642a24aa408d048553c5f3f5c09fd
+  - version: rocky-em
+    projects:
+      - repo: openstack/python-tripleoclient
+        hash: 934711db2bc642a24aa408d048553c5f3f5c09fd
 branches:
  - location: 10.5.0
    name: stable/rocky
--- a/deliverables/rocky/tempest-tripleo-ui.yaml
+++ b/deliverables/rocky/tempest-tripleo-ui.yaml
@ -1,9 +0,0 @@
---
-include-pypi-link: false
-launchpad: tempest
-release-model: cycle-with-intermediary
-release-type: python-pypi
-repository-settings:
-  openstack/tempest-tripleo-ui: {}
-team: tripleo
-type: tempest-plugin
--- a/deliverables/rocky/tripleo-common.yaml
+++ b/deliverables/rocky/tripleo-common.yaml
@ -43,6 +43,10 @@ releases:
    projects:
      - repo: openstack/tripleo-common
        hash: 74991a643a616be3cfa63d874497a325075714aa
+  - version: rocky-em
+    projects:
+      - repo: openstack/tripleo-common
+        hash: 74991a643a616be3cfa63d874497a325075714aa
 branches:
  - location: 9.3.0
    name: stable/rocky
--- a/deliverables/rocky/tripleo-heat-templates.yaml
+++ b/deliverables/rocky/tripleo-heat-templates.yaml
@ -52,6 +52,10 @@ releases:
    projects:
      - repo: openstack/tripleo-heat-templates
        hash: 4a691d683124ea226a94799bc77c131c5e279096
+  - version: rocky-em
+    projects:
+      - repo: openstack/tripleo-heat-templates
+        hash: 4a691d683124ea226a94799bc77c131c5e279096
 branches:
  - location: 9.0.0.0rc1
    name: stable/rocky
--- a/deliverables/rocky/tripleo-image-elements.yaml
+++ b/deliverables/rocky/tripleo-image-elements.yaml
@ -36,6 +36,10 @@ releases:
    projects:
      - repo: openstack/tripleo-image-elements
        hash: 6cabcd7fe5147ef26d921511e482eb3111b32274
+  - version: rocky-em
+    projects:
+      - repo: openstack/tripleo-image-elements
+        hash: 6cabcd7fe5147ef26d921511e482eb3111b32274
 branches:
  - location: 9.0.0.0rc1
    name: stable/rocky
--- a/deliverables/rocky/tripleo-ipsec.yaml
+++ b/deliverables/rocky/tripleo-ipsec.yaml
@ -11,6 +11,10 @@ releases:
      - hash: 325d23340e9746a0aed4e815f1a9b8de4f449632
        repo: openstack/tripleo-ipsec
    version: 9.0.0
+  - version: rocky-em
+    projects:
+      - repo: openstack/tripleo-ipsec
+        hash: 325d23340e9746a0aed4e815f1a9b8de4f449632
 branches:
  - location: 9.0.0
    name: stable/rocky
--- a/deliverables/rocky/tripleo-puppet-elements.yaml
+++ b/deliverables/rocky/tripleo-puppet-elements.yaml
@ -44,6 +44,10 @@ releases:
    projects:
      - repo: openstack/tripleo-puppet-elements
        hash: 8813bfa061b0486e57a5e3d74f32339c12a35ef3
+  - version: rocky-em
+    projects:
+      - repo: openstack/tripleo-puppet-elements
+        hash: 8813bfa061b0486e57a5e3d74f32339c12a35ef3
 branches:
  - location: 9.0.0.0rc1
    name: stable/rocky
--- a/deliverables/rocky/tripleo-ui.yaml
+++ b/deliverables/rocky/tripleo-ui.yaml
@ -23,6 +23,10 @@ releases:
      - hash: 9bbece2f29be1f72007b8dde3e64c663605bd02a
        repo: openstack/tripleo-ui
    version: 9.3.0
+  - version: rocky-em
+    projects:
+      - repo: openstack/tripleo-ui
+        hash: 9bbece2f29be1f72007b8dde3e64c663605bd02a
 branches:
  - location: 9.3.0
    name: stable/rocky
--- a/deliverables/rocky/tripleo-validations.yaml
+++ b/deliverables/rocky/tripleo-validations.yaml
@ -31,6 +31,10 @@ releases:
      - hash: 8a84c011e692611249eddced636fec484c10bd24
        repo: openstack/tripleo-validations
    version: 9.4.0
+  - version: rocky-em
+    projects:
+      - repo: openstack/tripleo-validations
+        hash: 8a84c011e692611249eddced636fec484c10bd24
 branches:
  - location: 9.3.0
    name: stable/rocky