From d679b0e814cec9694b44b304c6a4570420451aa4 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 21 Oct 2021 14:49:40 +0100 Subject: [PATCH] 21.10 - Release Remove the "channel: candidate" from the func-test bundles. Change-Id: Ie779b6004a65cd816e881a603ddf572dedb035d7 --- src/tests/bundles/bionic-rocky.yaml | 3 --- src/tests/bundles/bionic-stein.yaml | 3 --- src/tests/bundles/bionic-train.yaml | 3 --- src/tests/bundles/bionic-ussuri.yaml | 3 --- src/tests/bundles/focal-ussuri.yaml | 5 ----- src/tests/bundles/focal-victoria.yaml | 5 ----- src/tests/bundles/focal-wallaby.yaml | 5 ----- src/tests/bundles/focal-xena.yaml | 5 ----- src/tests/bundles/groovy-victoria.yaml | 5 ----- src/tests/bundles/hirsute-wallaby.yaml | 5 ----- src/tests/bundles/impish-xena.yaml | 5 ----- 11 files changed, 47 deletions(-) diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 9f53395..e99f5e3 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -14,7 +14,6 @@ applications: num_units: 1 to: - '0' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -23,7 +22,6 @@ applications: openstack-origin: cloud:bionic-rocky to: - '1' - channel: candidate barbican: series: bionic @@ -40,7 +38,6 @@ applications: num_units: 1 to: - '3' - channel: candidate relations: - - mysql:shared-db diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index eec6a99..bbac7f4 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -14,7 +14,6 @@ applications: num_units: 1 to: - '0' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -23,7 +22,6 @@ applications: openstack-origin: cloud:bionic-stein to: - '1' - channel: candidate barbican: series: bionic @@ -40,7 +38,6 @@ applications: num_units: 1 to: - '3' - channel: candidate relations: - - mysql:shared-db diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 897af0a..78b84ee 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -14,7 +14,6 @@ applications: num_units: 1 to: - '0' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -23,7 +22,6 @@ applications: openstack-origin: cloud:bionic-train to: - '1' - channel: candidate barbican: series: bionic @@ -40,7 +38,6 @@ applications: num_units: 1 to: - '3' - channel: candidate relations: - - mysql:shared-db diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 866d789..75a8507 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -14,7 +14,6 @@ applications: num_units: 1 to: - '0' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -23,7 +22,6 @@ applications: openstack-origin: cloud:bionic-ussuri to: - '1' - channel: candidate barbican: series: bionic @@ -40,7 +38,6 @@ applications: num_units: 1 to: - '3' - channel: candidate relations: - - mysql:shared-db diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 60a6457..f839902 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -18,10 +18,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate barbican-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -32,7 +30,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -41,7 +38,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate barbican: series: *series @@ -58,7 +54,6 @@ applications: num_units: 1 to: - '5' - channel: candidate relations: diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index 1b85737..e44e3c4 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -18,10 +18,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate barbican-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -32,7 +30,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -41,7 +38,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate barbican: series: *series @@ -58,7 +54,6 @@ applications: num_units: 1 to: - '5' - channel: candidate relations: diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml index 440ec36..4b380fb 100644 --- a/src/tests/bundles/focal-wallaby.yaml +++ b/src/tests/bundles/focal-wallaby.yaml @@ -18,10 +18,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate barbican-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -32,7 +30,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -41,7 +38,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate barbican: series: *series @@ -58,7 +54,6 @@ applications: num_units: 1 to: - '5' - channel: candidate relations: diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index a13d7d2..5b3be16 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -18,10 +18,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate barbican-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -32,7 +30,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -41,7 +38,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate barbican: series: *series @@ -58,7 +54,6 @@ applications: num_units: 1 to: - '5' - channel: candidate relations: diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml index d41ab07..e5924db 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/groovy-victoria.yaml @@ -18,10 +18,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate barbican-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -32,7 +30,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -41,7 +38,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate barbican: series: *series @@ -58,7 +54,6 @@ applications: num_units: 1 to: - '5' - channel: candidate relations: diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml index afa5ca3..e58716e 100644 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -18,10 +18,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate barbican-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -32,7 +30,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -41,7 +38,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate barbican: series: *series @@ -58,7 +54,6 @@ applications: num_units: 1 to: - '5' - channel: candidate relations: diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 0b6e3ec..8232092 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -18,10 +18,8 @@ applications: keystone-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate barbican-mysql-router: charm: cs:~openstack-charmers/mysql-router - channel: candidate mysql-innodb-cluster: charm: cs:~openstack-charmers/mysql-innodb-cluster @@ -32,7 +30,6 @@ applications: - '0' - '1' - '2' - channel: candidate keystone: charm: cs:~openstack-charmers/keystone @@ -41,7 +38,6 @@ applications: openstack-origin: *openstack-origin to: - '3' - channel: candidate barbican: series: *series @@ -58,7 +54,6 @@ applications: num_units: 1 to: - '5' - channel: candidate relations: