Merge "Transition TripleO to Queens EM"

2019-11-14 16:44:40 +00:00 · 2019-11-14 16:44:40 +00:00 · 68e240e953
commit 68e240e953
parent 24d1fe71c6 1c099747ef
16 changed files with 64 additions and 0 deletions
--- a/deliverables/queens/instack-undercloud.yaml
+++ b/deliverables/queens/instack-undercloud.yaml
@ -63,6 +63,10 @@ releases:
    projects:
      - repo: openstack/instack-undercloud
        hash: 1910a4b06beb67d8cdd143dde39f7200f31ea7ad
+  - version: queens-em
+    projects:
+      - repo: openstack/instack-undercloud
+        hash: 1910a4b06beb67d8cdd143dde39f7200f31ea7ad
 repository-settings:
  openstack/instack-undercloud: {}
 branches:
--- a/deliverables/queens/instack.yaml
+++ b/deliverables/queens/instack.yaml
@ -13,6 +13,10 @@ releases:
      - hash: d71921cd87e5a7bdd85bb218c8f7b0c5654a0b01
        repo: openstack/instack
    version: 8.1.0
+  - version: queens-em
+    projects:
+      - repo: openstack/instack
+        hash: d71921cd87e5a7bdd85bb218c8f7b0c5654a0b01
 branches:
  - name: stable/queens
    location: 8.1.0
--- a/deliverables/queens/os-apply-config.yaml
+++ b/deliverables/queens/os-apply-config.yaml
@ -29,6 +29,10 @@ releases:
      - hash: ad29f1d44923d12c8c91e6389fda6535653dac2c
        repo: openstack/os-apply-config
    version: 8.3.2
+  - version: queens-em
+    projects:
+      - repo: openstack/os-apply-config
+        hash: ad29f1d44923d12c8c91e6389fda6535653dac2c
 repository-settings:
  openstack/os-apply-config: {}
 branches:
--- a/deliverables/queens/os-collect-config.yaml
+++ b/deliverables/queens/os-collect-config.yaml
@ -25,6 +25,10 @@ releases:
      - hash: cf2d08c7a5ed428c3db0c76379b4cf6a5b791055
        repo: openstack/os-collect-config
    version: 8.3.1
+  - version: queens-em
+    projects:
+      - repo: openstack/os-collect-config
+        hash: cf2d08c7a5ed428c3db0c76379b4cf6a5b791055
 repository-settings:
  openstack/os-collect-config: {}
 branches:
--- a/deliverables/queens/os-net-config.yaml
+++ b/deliverables/queens/os-net-config.yaml
@ -49,6 +49,10 @@ releases:
    projects:
      - repo: openstack/os-net-config
        hash: 2a374db9847b92cc3f9da9be20a614932d9dd997
+  - version: queens-em
+    projects:
+      - repo: openstack/os-net-config
+        hash: 2a374db9847b92cc3f9da9be20a614932d9dd997
 repository-settings:
  openstack/os-net-config: {}
 branches:
--- a/deliverables/queens/os-refresh-config.yaml
+++ b/deliverables/queens/os-refresh-config.yaml
@ -25,6 +25,10 @@ releases:
      - hash: 4703b548bfcdedc1e56d93c62777f4e5061fca5d
        repo: openstack/os-refresh-config
    version: 8.3.1
+  - version: queens-em
+    projects:
+      - repo: openstack/os-refresh-config
+        hash: 4703b548bfcdedc1e56d93c62777f4e5061fca5d
 repository-settings:
  openstack/os-refresh-config: {}
 branches:
--- a/deliverables/queens/paunch.yaml
+++ b/deliverables/queens/paunch.yaml
@ -41,6 +41,10 @@ releases:
    projects:
      - repo: openstack/paunch
        hash: 5004a33433b2bd4ebf8f24e60db005acbc4d4711
+  - version: queens-em
+    projects:
+      - repo: openstack/paunch
+        hash: 5004a33433b2bd4ebf8f24e60db005acbc4d4711
 repository-settings:
  openstack/paunch: {}
 release-notes: https://docs.openstack.org/releasenotes/paunch/queens.html
--- a/deliverables/queens/puppet-tripleo.yaml
+++ b/deliverables/queens/puppet-tripleo.yaml
@ -60,6 +60,10 @@ releases:
    projects:
      - repo: openstack/puppet-tripleo
        hash: 151177ef16a84fbedde9828f762b1639b183bcfd
+  - version: queens-em
+    projects:
+      - repo: openstack/puppet-tripleo
+        hash: 151177ef16a84fbedde9828f762b1639b183bcfd
 repository-settings:
  openstack/puppet-tripleo: {}
 branches:
--- a/deliverables/queens/python-tripleoclient.yaml
+++ b/deliverables/queens/python-tripleoclient.yaml
@ -66,6 +66,10 @@ releases:
    projects:
      - repo: openstack/python-tripleoclient
        hash: 173e91f238ed651ff813cecce44265a94df3b114
+  - version: queens-em
+    projects:
+      - repo: openstack/python-tripleoclient
+        hash: 173e91f238ed651ff813cecce44265a94df3b114
 release-notes: https://docs.openstack.org/releasenotes/python-tripleoclient/queens.html
 repository-settings:
  openstack/python-tripleoclient: {}
--- a/deliverables/queens/tripleo-common.yaml
+++ b/deliverables/queens/tripleo-common.yaml
@ -75,6 +75,10 @@ releases:
    projects:
      - repo: openstack/tripleo-common
        hash: 609c1a8d7d72d0b6255b62da3ecd505b1ec08309
+  - version: queens-em
+    projects:
+      - repo: openstack/tripleo-common
+        hash: 609c1a8d7d72d0b6255b62da3ecd505b1ec08309
 cycle-highlights:
  - |
    config-download: Ability to use Ansible to apply the cloud configuration.
--- a/deliverables/queens/tripleo-heat-templates.yaml
+++ b/deliverables/queens/tripleo-heat-templates.yaml
@ -84,6 +84,10 @@ releases:
    projects:
      - repo: openstack/tripleo-heat-templates
        hash: 80a67e6c8f81888bf01782e2746e4bb9ede5a1d0
+  - version: queens-em
+    projects:
+      - repo: openstack/tripleo-heat-templates
+        hash: 80a67e6c8f81888bf01782e2746e4bb9ede5a1d0
 repository-settings:
  openstack/tripleo-heat-templates: {}
 branches:
--- a/deliverables/queens/tripleo-image-elements.yaml
+++ b/deliverables/queens/tripleo-image-elements.yaml
@ -38,6 +38,10 @@ releases:
    projects:
      - repo: openstack/tripleo-image-elements
        hash: 7e0c59a905c9a066d7dbc9f452084abc98f1a7c8
+  - version: queens-em
+    projects:
+      - repo: openstack/tripleo-image-elements
+        hash: 7e0c59a905c9a066d7dbc9f452084abc98f1a7c8
 repository-settings:
  openstack/tripleo-image-elements: {}
 branches:
--- a/deliverables/queens/tripleo-ipsec.yaml
+++ b/deliverables/queens/tripleo-ipsec.yaml
@ -21,6 +21,10 @@ releases:
      - hash: 61eac5e734f97ecf3ee2c176530174e7955aeabe
        repo: openstack/tripleo-ipsec
    version: 8.1.0
+  - version: queens-em
+    projects:
+      - repo: openstack/tripleo-ipsec
+        hash: 61eac5e734f97ecf3ee2c176530174e7955aeabe
 branches:
  - name: stable/queens
    location: 8.1.0
--- a/deliverables/queens/tripleo-puppet-elements.yaml
+++ b/deliverables/queens/tripleo-puppet-elements.yaml
@ -42,6 +42,10 @@ releases:
    projects:
      - repo: openstack/tripleo-puppet-elements
        hash: a4fc3a70b0dc2848deb13f477ac5f53cec1ed63d
+  - version: queens-em
+    projects:
+      - repo: openstack/tripleo-puppet-elements
+        hash: a4fc3a70b0dc2848deb13f477ac5f53cec1ed63d
 repository-settings:
  openstack/tripleo-puppet-elements: {}
 branches:
--- a/deliverables/queens/tripleo-ui.yaml
+++ b/deliverables/queens/tripleo-ui.yaml
@ -29,6 +29,10 @@ releases:
      - hash: 93101f26e25ec8788b061554d3181d4c84148c9c
        repo: openstack/tripleo-ui
    version: 8.3.2
+  - version: queens-em
+    projects:
+      - repo: openstack/tripleo-ui
+        hash: 93101f26e25ec8788b061554d3181d4c84148c9c
 repository-settings:
  openstack/tripleo-ui: {}
 branches:
--- a/deliverables/queens/tripleo-validations.yaml
+++ b/deliverables/queens/tripleo-validations.yaml
@ -51,6 +51,10 @@ releases:
      - hash: 49f8aad6c526445b80664130bb539140284ed3b9
        repo: openstack/tripleo-validations
    version: 8.5.0
+  - version: queens-em
+    projects:
+      - repo: openstack/tripleo-validations
+        hash: 49f8aad6c526445b80664130bb539140284ed3b9
 repository-settings:
  openstack/tripleo-validations: {}
 branches: