From 1c4c4fd7349bd78937c237dfe13fa3891945eff1 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 26 Jul 2017 08:56:02 +0200
Subject: [PATCH] Switch openSUSE to 42.3 by default

This is the latest stable release, so we should default to it.

Change-Id: I05643787002d339ccbf7a718847fe4ed6f39eacc
---
 diskimage_builder/elements/opensuse-minimal/README.rst      | 2 +-
 .../environment.d/10-opensuse-distro-name.bash              | 2 +-
 diskimage_builder/elements/opensuse/README.rst              | 2 +-
 .../opensuse/environment.d/10-opensuse-distro-name.bash     | 2 +-
 .../notes/opensuse-423-default-3bc73fff69374cd0.yaml        | 6 ++++++
 5 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/opensuse-423-default-3bc73fff69374cd0.yaml

diff --git a/diskimage_builder/elements/opensuse-minimal/README.rst b/diskimage_builder/elements/opensuse-minimal/README.rst
index 3a01c3f9..fa0b925e 100644
--- a/diskimage_builder/elements/opensuse-minimal/README.rst
+++ b/diskimage_builder/elements/opensuse-minimal/README.rst
@@ -13,5 +13,5 @@ Environment Variables
 
 DIB_RELEASE
   :Required: No
-  :Default: 42.2
+  :Default: 42.3
   :Description: Set the desired openSUSE release.
diff --git a/diskimage_builder/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash b/diskimage_builder/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash
index c14401b3..3e869e10 100644
--- a/diskimage_builder/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash
+++ b/diskimage_builder/elements/opensuse-minimal/environment.d/10-opensuse-distro-name.bash
@@ -1,4 +1,4 @@
 export DISTRO_NAME=opensuse
-DIB_RELEASE=${DIB_RELEASE:-42.2}
+DIB_RELEASE=${DIB_RELEASE:-42.3}
 export DIB_RELEASE=${DIB_RELEASE,,}
 export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base
diff --git a/diskimage_builder/elements/opensuse/README.rst b/diskimage_builder/elements/opensuse/README.rst
index 97a90fa9..e6ec7169 100644
--- a/diskimage_builder/elements/opensuse/README.rst
+++ b/diskimage_builder/elements/opensuse/README.rst
@@ -14,7 +14,7 @@ Environment Variables
 
 DIB_RELEASE
   :Required: No
-  :Default: 42.2
+  :Default: 42.3
   :Description: Set the desired openSUSE release.
 
 DIB_CLOUD_IMAGES
diff --git a/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash b/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
index 1abd30c0..1b92a956 100644
--- a/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
+++ b/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
@@ -1,5 +1,5 @@
 export DISTRO_NAME=opensuse
-export DIB_RELEASE=${DIB_RELEASE:-42.2}
+export DIB_RELEASE=${DIB_RELEASE:-42.3}
 export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base
 case ${DIB_RELEASE} in
     # Old openSUSE releases
diff --git a/releasenotes/notes/opensuse-423-default-3bc73fff69374cd0.yaml b/releasenotes/notes/opensuse-423-default-3bc73fff69374cd0.yaml
new file mode 100644
index 00000000..242dd22f
--- /dev/null
+++ b/releasenotes/notes/opensuse-423-default-3bc73fff69374cd0.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The opensuse and opensuse-minimal element are now defaulting to 42.3, which
+    is the latest stable openSUSE release. Building for 42.2 is still supported,
+    however requires setting DIB_RELEASE to '42.2' explicitly.