From 604f2eaace356e6028324c4621851082fe3f6bf1 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Mon, 18 May 2020 17:12:04 -0500 Subject: [PATCH 1/3] Switch B-F lite series upgrade test to zaza.os branch See issue: https://github.com/openstack-charmers/zaza-openstack-tests/issues/284 --- .../ubuntu-lite-series-upgrade-bionic/test-requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 120000 => 100644 development/ubuntu-lite-series-upgrade-bionic/test-requirements.txt diff --git a/development/ubuntu-lite-series-upgrade-bionic/test-requirements.txt b/development/ubuntu-lite-series-upgrade-bionic/test-requirements.txt deleted file mode 120000 index 7e27b6d3..00000000 --- a/development/ubuntu-lite-series-upgrade-bionic/test-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -../shared/test-requirements.txt \ No newline at end of file diff --git a/development/ubuntu-lite-series-upgrade-bionic/test-requirements.txt b/development/ubuntu-lite-series-upgrade-bionic/test-requirements.txt new file mode 100644 index 00000000..d28559a3 --- /dev/null +++ b/development/ubuntu-lite-series-upgrade-bionic/test-requirements.txt @@ -0,0 +1,4 @@ +# zaza +git+https://github.com/openstack-charmers/zaza.git#egg=zaza +# zaza.openstack +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@focal-parallel-series-upgrade-ubuntu-lite#egg=zaza.openstack # https://github.com/openstack-charmers/zaza-openstack-tests/issues/284 From ca0671d26513e0299e90507f5b83d06f63d91827 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Tue, 19 May 2020 15:07:09 -0500 Subject: [PATCH 2/3] Also switch T-X and X-B to zaza-.os branch --- .../ubuntu-lite-series-upgrade-trusty/test-requirements.txt | 5 ++++- .../ubuntu-lite-series-upgrade-xenial/test-requirements.txt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) mode change 120000 => 100644 development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt mode change 120000 => 100644 development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt diff --git a/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt b/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt deleted file mode 120000 index 7e27b6d3..00000000 --- a/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -../shared/test-requirements.txt \ No newline at end of file diff --git a/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt b/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt new file mode 100644 index 00000000..d28559a3 --- /dev/null +++ b/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt @@ -0,0 +1,4 @@ +# zaza +git+https://github.com/openstack-charmers/zaza.git#egg=zaza +# zaza.openstack +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@focal-parallel-series-upgrade-ubuntu-lite#egg=zaza.openstack # https://github.com/openstack-charmers/zaza-openstack-tests/issues/284 diff --git a/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt b/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt deleted file mode 120000 index 7e27b6d3..00000000 --- a/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -../shared/test-requirements.txt \ No newline at end of file diff --git a/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt b/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt new file mode 100644 index 00000000..d28559a3 --- /dev/null +++ b/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt @@ -0,0 +1,4 @@ +# zaza +git+https://github.com/openstack-charmers/zaza.git#egg=zaza +# zaza.openstack +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@focal-parallel-series-upgrade-ubuntu-lite#egg=zaza.openstack # https://github.com/openstack-charmers/zaza-openstack-tests/issues/284 From 0386c3b0ffdada043a18778038ce6eafe59ed0bb Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 20 May 2020 08:20:08 -0500 Subject: [PATCH 3/3] Revert "Also switch T-X and X-B to zaza-.os branch" This reverts commit ca0671d26513e0299e90507f5b83d06f63d91827. --- .../ubuntu-lite-series-upgrade-trusty/test-requirements.txt | 5 +---- .../ubuntu-lite-series-upgrade-xenial/test-requirements.txt | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) mode change 100644 => 120000 development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt mode change 100644 => 120000 development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt diff --git a/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt b/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt deleted file mode 100644 index d28559a3..00000000 --- a/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# zaza -git+https://github.com/openstack-charmers/zaza.git#egg=zaza -# zaza.openstack -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@focal-parallel-series-upgrade-ubuntu-lite#egg=zaza.openstack # https://github.com/openstack-charmers/zaza-openstack-tests/issues/284 diff --git a/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt b/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt new file mode 120000 index 00000000..7e27b6d3 --- /dev/null +++ b/development/ubuntu-lite-series-upgrade-trusty/test-requirements.txt @@ -0,0 +1 @@ +../shared/test-requirements.txt \ No newline at end of file diff --git a/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt b/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt deleted file mode 100644 index d28559a3..00000000 --- a/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# zaza -git+https://github.com/openstack-charmers/zaza.git#egg=zaza -# zaza.openstack -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@focal-parallel-series-upgrade-ubuntu-lite#egg=zaza.openstack # https://github.com/openstack-charmers/zaza-openstack-tests/issues/284 diff --git a/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt b/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt new file mode 120000 index 00000000..7e27b6d3 --- /dev/null +++ b/development/ubuntu-lite-series-upgrade-xenial/test-requirements.txt @@ -0,0 +1 @@ +../shared/test-requirements.txt \ No newline at end of file