openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Switch to openSUSE Leap 42.2 release by default"

This commit is contained in:
Jenkins 2016-12-19 08:40:32 +00:00 committed by Gerrit Code Review
parent e0a2163157 54f4e12765
commit bbe81c30be
7 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ Environment Variables
DIB_RELEASE
:Required: No
:Default: 42.1
:Default: 42.2
:Description: Set the desired openSUSE release.
DIB_OPENSUSE_MIRROR:

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

@ -1,5 +1,5 @@
export DISTRO_NAME=opensuse
DIB_RELEASE=${DIB_RELEASE:-42.1}
DIB_RELEASE=${DIB_RELEASE:-42.2}
export DIB_RELEASE=${DIB_RELEASE,,}
export DIB_OPENSUSE_MIRROR=${DIB_OPENSUSE_MIRROR:-http://download.opensuse.org}
case ${DIB_RELEASE} in

2
elements/opensuse/README.rst
View File

@ -18,7 +18,7 @@ Environment Variables
DIB_RELEASE
:Required: No
:Default: 13.1
:Default: 42.2
:Description: Set the desired openSUSE release.
DIB_CLOUD_IMAGES

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

@ -1,5 +1,5 @@
export DISTRO_NAME=opensuse
export DIB_RELEASE=${DIB_RELEASE:-13.1}
export DIB_RELEASE=${DIB_RELEASE:-42.2}
case ${DIB_RELEASE} in
# Old openSUSE releases
13*) export OPENSUSE_REPO_DIR=openSUSE_${DIB_RELEASE} ;;

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

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

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

@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright 2016 SUSE Linux Products Gmb
# Copyright 2016 SUSE Linux GmbH
# Copyright 2015 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may

1
tests/run_functests.sh
View File

@ -18,6 +18,7 @@ DEFAULT_SKIP_TESTS=(
fedora/build-succeeds
# in non-voting
gentoo/build-succeeds
opensuse/build-succeeds
# good to have the test case around - but because of changes
# in testing does not work always.
debian-minimal/testing-build-succeeds