sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update test coverage for openSUSE/-minimal to 15.1"

Browse Source
This commit is contained in:
Zuul 2019-06-18 06:21:21 +00:00 committed by Gerrit Code Review
commit fe618002ff
19 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.d/jobs.yaml
View File

@ -69,7 +69,7 @@
dib_functests: dib_functests:
- centos7/build-succeeds - centos7/build-succeeds
- opensuse/build-succeeds - opensuse/build-succeeds
- opensuse/opensuse150-build-succeeds - opensuse/opensuse151-build-succeeds
- fedora/build-succeeds - fedora/build-succeeds
- ubuntu/trusty-build-succeeds - ubuntu/trusty-build-succeeds
- ubuntu/xenial-build-succeeds - ubuntu/xenial-build-succeeds
@ -187,7 +187,7 @@
# opensuse-minimal can only build on xenial ATM, as other # opensuse-minimal can only build on xenial ATM, as other
# platforms don't have zypper # platforms don't have zypper
dib_functests_extra: dib_functests_extra:
- opensuse-minimal/opensuse150-build-succeeds - opensuse-minimal/opensuse151-build-succeeds
- job: - job:
name: dib-functests-xenial-python3-containers name: dib-functests-xenial-python3-containers

2
diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
View File

@ -24,8 +24,10 @@ if [ -z "${DIB_PYTHON_VERSION:-}" ]; then
DIB_PYTHON_VERSION=3 DIB_PYTHON_VERSION=3
fi fi
elif [ "$DISTRO_NAME" == "opensuse" ]; then elif [ "$DISTRO_NAME" == "opensuse" ]; then
if [ "${DIB_RELEASE:0:2}" == "42" ]; then
DIB_PYTHON_VERSION=2 DIB_PYTHON_VERSION=2
fi fi
fi
fi fi
if [ -z "${DIB_PYTHON_VERSION:-}" ]; then if [ -z "${DIB_PYTHON_VERSION:-}" ]; then

2
diskimage_builder/elements/opensuse-minimal/README.rst
View File

@ -13,5 +13,5 @@ Environment Variables
DIB_RELEASE DIB_RELEASE
:Required: No :Required: No
:Default: 15.0 :Default: 15.1
:Description: Set the desired openSUSE release. :Description: Set the desired openSUSE release.

2
diskimage_builder/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash
View File

@ -1,4 +1,4 @@
export DISTRO_NAME=opensuse export DISTRO_NAME=opensuse
DIB_RELEASE=${DIB_RELEASE:-15.0} DIB_RELEASE=${DIB_RELEASE:-15.1}
export DIB_RELEASE=${DIB_RELEASE,,} export DIB_RELEASE=${DIB_RELEASE,,}
export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base

1
diskimage_builder/elements/opensuse-minimal/test-elements/opensuse150-build-succeeds/README.rst
View File

@ -1 +0,0 @@
Verify we can build an openSUSE Leap 15.0 image.

1
diskimage_builder/elements/opensuse-minimal/test-elements/opensuse150-build-succeeds/environment.d/10-set-distro.bash
View File

@ -1 +0,0 @@
export DIB_RELEASE=15.0

1
diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/README.rst Normal file
View File

@ -0,0 +1 @@
Verify we can build an openSUSE Leap 15.1 image.

0
diskimage_builder/elements/opensuse-minimal/test-elements/opensuse150-build-succeeds/element-deps → diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/element-deps
View File

1
diskimage_builder/elements/opensuse-minimal/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash Normal file
View File

@ -0,0 +1 @@
export DIB_RELEASE=15.1

2
diskimage_builder/elements/opensuse/README.rst
View File

@ -14,7 +14,7 @@ Environment Variables
DIB_RELEASE DIB_RELEASE
:Required: No :Required: No
:Default: 15.0 :Default: 15.1
:Description: Set the desired openSUSE release. :Description: Set the desired openSUSE release.
DIB_CLOUD_IMAGES DIB_CLOUD_IMAGES

2
diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
View File

@ -1,5 +1,5 @@
export DISTRO_NAME=opensuse export DISTRO_NAME=opensuse
export DIB_RELEASE=${DIB_RELEASE:-15.0} export DIB_RELEASE=${DIB_RELEASE:-15.1}
export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base
case ${DIB_RELEASE} in case ${DIB_RELEASE} in
# Old Leap releases # Old Leap releases

1
diskimage_builder/elements/opensuse/test-elements/opensuse150-build-succeeds/README.rst
View File

@ -1 +0,0 @@
Verify we can build an openSUSE Leap 15.0 image.

1
diskimage_builder/elements/opensuse/test-elements/opensuse150-build-succeeds/environment.d/10-set-distro.bash
View File

@ -1 +0,0 @@
export DIB_RELEASE=15.0

1
diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/README.rst Normal file
View File

@ -0,0 +1 @@
Verify we can build an openSUSE Leap 15.1 image.

1
diskimage_builder/elements/opensuse/test-elements/opensuse151-build-succeeds/environment.d/10-set-distro.bash Normal file
View File

@ -0,0 +1 @@
export DIB_RELEASE=15.1

9
diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
View File

@ -37,7 +37,7 @@ function cleanup() {
trap cleanup EXIT trap cleanup EXIT
ZYPPER_TARGET_OPTS="--non-interactive --gpg-auto-import-keys --root $TARGET_ROOT" ZYPPER_TARGET_OPTS="--non-interactive --gpg-auto-import-keys --root $TARGET_ROOT"
ZYPPER_INSTALL_OPTS="--no-recommends" ZYPPER_INSTALL_SYSTEM_PYTHON="python3"
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-https://download.opensuse.org} DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-https://download.opensuse.org}
@ -46,6 +46,7 @@ case ${DIB_RELEASE} in
42*) 42*)
ZYPPER_REPOS="update=>${DIB_DISTRIBUTION_MIRROR}/update/leap/${DIB_RELEASE}/oss/ " ZYPPER_REPOS="update=>${DIB_DISTRIBUTION_MIRROR}/update/leap/${DIB_RELEASE}/oss/ "
ZYPPER_REPOS+="oss=>${DIB_DISTRIBUTION_MIRROR}/distribution/leap/${DIB_RELEASE}/repo/oss/" ZYPPER_REPOS+="oss=>${DIB_DISTRIBUTION_MIRROR}/distribution/leap/${DIB_RELEASE}/repo/oss/"
ZYPPER_INSTALL_SYSTEM_PYTHON="python"
;; ;;
# New Leap releases # New Leap releases
15*) 15*)
@ -94,9 +95,11 @@ sudo mount -t devpts $(mount_dev_pts_options) devpts $TARGET_ROOT/dev/pts
sudo mount -t sysfs none $TARGET_ROOT/sys sudo mount -t sysfs none $TARGET_ROOT/sys
# Install filesystem, base and useful tools # Install filesystem, base and useful tools
sudo zypper ${ZYPPER_TARGET_OPTS} install ${ZYPPER_INSTALL_OPTS} filesystem sudo zypper ${ZYPPER_TARGET_OPTS} install --no-recommends filesystem
# Install basic components in order # Install basic components in order
sudo zypper ${ZYPPER_TARGET_OPTS} install ${ZYPPER_INSTALL_OPTS} ${DIB_OPENSUSE_PATTERNS} python zypper sudo sudo zypper ${ZYPPER_TARGET_OPTS} install \
${DIB_OPENSUSE_PATTERNS} ${ZYPPER_INSTALL_SYSTEM_PYTHON} \
zypper sudo ca-certificates-mozilla
# Put in a dummy /etc/resolv.conf over the temporary one we used # Put in a dummy /etc/resolv.conf over the temporary one we used
# to bootstrap. systemd has a bug/feature [1] that it will assume # to bootstrap. systemd has a bug/feature [1] that it will assume

4
doc/source/user_guide/supported_distros.rst
View File

@ -9,7 +9,7 @@ Distributions which are supported as a build host:
- RHEL 6, 7 - RHEL 6, 7
- Ubuntu 14.04 ("trusty") - Ubuntu 14.04 ("trusty")
- Gentoo - Gentoo
- openSUSE Leap 42.2, 42.3, 15.0 and Tumbleweed - openSUSE Leap 42.3, 15.0, 15.1 and Tumbleweed
Distributions which are supported as a target for an image: Distributions which are supported as a target for an image:
@ -20,4 +20,4 @@ Distributions which are supported as a target for an image:
- RHEL 6, 7 - RHEL 6, 7
- Ubuntu 12.04 ("precise"), 14.04 ("trusty") - Ubuntu 12.04 ("precise"), 14.04 ("trusty")
- Gentoo - Gentoo
- openSUSE Leap 42.2, 42.3, 15.0 and Tumbleweed (opensuse-minimal only) - openSUSE Leap 42.3, 15.0, 15.1 and Tumbleweed (opensuse-minimal only)

11
releasenotes/notes/opensuse-151-default-67ccfffbc134704d.yaml Normal file
View File

@ -0,0 +1,11 @@
---
deprecations:
- |
Support in opensuse and opensuse-minimal for openSUSE 42.2 has been removed
as these are end of life.
upgrade:
- |
The opensuse and opensuse-minimal element are now defaulting to build 15.1.
Building for 42.3 and 15.0 is still supported, however requires setting
DIB_RELEASE to '42.3' resp. '15.0' explicitly.

4
tests/run_functests.sh
View File

@ -26,7 +26,7 @@ DEFAULT_SKIP_TESTS=(
# These require "zypper" on the host which is not available on # These require "zypper" on the host which is not available on
# all platforms # all platforms
opensuse-minimal/build-succeeds opensuse-minimal/build-succeeds
opensuse-minimal/opensuse150-build-succeeds opensuse-minimal/opensuse151-build-succeeds
# non-voting; not used by infra currently # non-voting; not used by infra currently
gentoo/build-succeeds gentoo/build-succeeds
# Needs infra mirroring to move to voting job # 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 # in the gate. Keep them in a -nv job until we can figure out
# better caching for the images # better caching for the images
opensuse/build-succeeds opensuse/build-succeeds
opensuse/opensuse423-build-succeeds opensuse/opensuse151-build-succeeds
centos7/build-succeeds centos7/build-succeeds
debian/build-succeeds debian/build-succeeds
fedora/build-succeeds fedora/build-succeeds