From d40c87876ac1999599ba2d683e1ba51d2c882309 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 30 Aug 2019 22:35:27 +0200 Subject: [PATCH] Rename openSUSE 15.1 testing to 15 This is consistent with the previous simplication of build targets in the opendev environment to refer to "opensuse15" being the alias of "latest stable openSUSE Leap 15.x". Change-Id: I904a3ca0d6dbddd2bb1a673836ab6a0ad249526d --- .zuul.d/jobs.yaml | 8 ++++---- .zuul.d/project.yaml | 6 ++---- .../README.rst | 0 .../element-deps | 0 .../environment.d/10-set-distro.bash | 0 .../README.rst | 0 .../environment.d/10-set-distro.bash | 0 tests/run_functests.sh | 4 ++-- 8 files changed, 8 insertions(+), 10 deletions(-) rename diskimage_builder/elements/opensuse-minimal/test-elements/{opensuse151-build-succeeds => opensuse15-build-succeeds}/README.rst (100%) rename diskimage_builder/elements/opensuse-minimal/test-elements/{opensuse151-build-succeeds => opensuse15-build-succeeds}/element-deps (100%) rename diskimage_builder/elements/opensuse-minimal/test-elements/{opensuse151-build-succeeds => opensuse15-build-succeeds}/environment.d/10-set-distro.bash (100%) rename diskimage_builder/elements/opensuse/test-elements/{opensuse151-build-succeeds => opensuse15-build-succeeds}/README.rst (100%) rename diskimage_builder/elements/opensuse/test-elements/{opensuse151-build-succeeds => opensuse15-build-succeeds}/environment.d/10-set-distro.bash (100%) diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 0f3768de5..4db297fb6 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -43,7 +43,7 @@ dib_functests: - centos7/build-succeeds - opensuse/build-succeeds - - opensuse/opensuse151-build-succeeds + - opensuse/opensuse15-build-succeeds - fedora/build-succeeds - ubuntu/trusty-build-succeeds - ubuntu/xenial-build-succeeds @@ -161,7 +161,7 @@ # opensuse-minimal can only build on xenial ATM, as other # platforms don't have zypper dib_functests_extra: - - opensuse-minimal/opensuse151-build-succeeds + - opensuse-minimal/opensuse15-build-succeeds - job: name: dib-functests-xenial-python3-containers @@ -382,9 +382,9 @@ mirror: "http://{{ zuul_site_mirror_fqdn }}/opensuse" - job: - name: dib-nodepool-functional-openstack-opensuse-151-src + name: dib-nodepool-functional-openstack-opensuse-15-src description: | - Test building and booting an openSUSE 15.1 image with Nodepool + Test building and booting an openSUSE 15.x image with Nodepool and OpenStack parent: dib-nodepool-functional-src-base nodeset: ubuntu-xenial # Bionic lacks zypper diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index f60cd261a..126c9a480 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -13,8 +13,7 @@ - dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-fedora-29-src - dib-nodepool-functional-openstack-fedora-30-src - - dib-nodepool-functional-openstack-opensuse-150-src - - dib-nodepool-functional-openstack-opensuse-151-src + - dib-nodepool-functional-openstack-opensuse-15-src - dib-nodepool-functional-openstack-ubuntu-trusty-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic @@ -38,8 +37,7 @@ - openstack-tox-pylint - dib-nodepool-functional-openstack-centos-7-src - dib-nodepool-functional-openstack-fedora-29-src - - dib-nodepool-functional-openstack-opensuse-150-src - - dib-nodepool-functional-openstack-opensuse-151-src + - dib-nodepool-functional-openstack-opensuse-15-src - dib-nodepool-functional-openstack-ubuntu-trusty-src - dib-nodepool-functional-openstack-ubuntu-xenial-src - dib-nodepool-functional-openstack-ubuntu-bionic diff --git a/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst b/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/README.rst similarity index 100% rename from diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst rename to diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/README.rst diff --git a/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps b/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/element-deps similarity index 100% rename from diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps rename to diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/element-deps diff --git a/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash similarity index 100% rename from diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash rename to diskimage_builder/elements/opensuse-minimal/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash diff --git a/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst b/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst similarity index 100% rename from diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst rename to diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst diff --git a/diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash similarity index 100% rename from diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash rename to diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash diff --git a/tests/run_functests.sh b/tests/run_functests.sh index 190043168..4aa7114fc 100755 --- a/tests/run_functests.sh +++ b/tests/run_functests.sh @@ -26,7 +26,7 @@ DEFAULT_SKIP_TESTS=( # These require "zypper" on the host which is not available on # all platforms opensuse-minimal/build-succeeds - opensuse-minimal/opensuse151-build-succeeds + opensuse-minimal/opensuse15-build-succeeds # non-voting; not used by infra currently gentoo/build-succeeds # Needs infra mirroring to move to voting job @@ -38,7 +38,7 @@ DEFAULT_SKIP_TESTS=( # in the gate. Keep them in a -nv job until we can figure out # better caching for the images opensuse/build-succeeds - opensuse/opensuse151-build-succeeds + opensuse/opensuse15-build-succeeds centos7/build-succeeds debian/build-succeeds fedora/build-succeeds