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

Deprecate rhel7 in favor of rhel

Browse Source 
The rhel7 element is deprecated and is left only for backward
compatibility.
The rhel element should be used instead. Users should set DIB_RELEASE to
'7' to indicate which release you are using.

The new element is a version-less RHEL element to handle both '7'
and '8' DIB_RELEASE, which aligns with other elements which operate in
the same way such as the Fedora element.

Change-Id: Ic39ed85cacae9942448eb18ad685763f9369c2ed
This commit is contained in:
Nir Magnezi 2019-03-26 12:49:15 +02:00
parent ee46e2f9b7
commit 433a374748
7 changed files with 17 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diskimage_builder/elements/rhel7/README.rst
View File

@ -1,6 +1,13 @@
=====
rhel7
=====
.. warning::
This element is deprecated and is left only for backward compatibility.
Use the `rhel` element instead. Note that you should set DIB_RELEASE to 7
to indicate which release you are using. Please read the notes.
Use RHEL 7 cloud images as the baseline for built disk images.
Because RHEL 7 base images are not publicly available, it is necessary to first

7
diskimage_builder/elements/rhel7/element-deps
View File

@ -1,6 +1 @@
cache-url
redhat-common
rhel-common
rpm-distro
source-repositories
yum
rhel

1
diskimage_builder/elements/rhel7/element-provides
View File

@ -1 +0,0 @@
operating-system

1
diskimage_builder/elements/rhel7/environment.d/00-rhel7-element-deprecation.bash Normal file
View File

@ -0,0 +1 @@
echo "The rhel7 element is deprecated and will be removed in future releases. Use the rhel element instead."

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

@ -1 +1 @@
export DISTRO_NAME=rhel7
export DIB_RELEASE=7

44
diskimage_builder/elements/rhel7/root.d/10-rhel7-cloud-image
View File

@ -1,44 +0,0 @@
#!/bin/bash
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
[ -n "$ARCH" ]
[ -n "$TARGET_ROOT" ]
if [[ "amd64 x86_64" =~ "$ARCH" ]]; then
ARCH="x86_64"
elif [[ "ppc64le" =~ "$ARCH" ]]; then
# We don't need to do anything here other than avoid the else clause
:
else
echo 'rhel7 root element only supports x86_64 and ppc64le values for $ARCH'
exit 1
fi
DIB_LOCAL_IMAGE=${DIB_LOCAL_IMAGE:-""}
if [ -n "$DIB_LOCAL_IMAGE" ]; then
IMAGE_LOCATION=$DIB_LOCAL_IMAGE
# No need to copy a local image into the cache directory, so just specify
# the cached path as the original path.
CACHED_IMAGE=$IMAGE_LOCATION
BASE_IMAGE_FILE=`basename $DIB_LOCAL_IMAGE`
BASE_IMAGE_TAR=$BASE_IMAGE_FILE.tgz
else
if [ -z "${BASE_IMAGE_FILE:-}" -o -z "${DIB_CLOUD_IMAGES:-}" ]; then
echo "No source for a base image file configured."
echo "See rhel7 element readme for details on how to obtain and use a base image."
exit 1
fi
DIB_RELEASE=${DIB_RELEASE:-latest}
BASE_IMAGE_TAR=$DIB_RELEASE-rhel-server-$ARCH-latest.tgz
IMAGE_LOCATION=$DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE
CACHED_IMAGE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE
fi
$TMP_HOOKS_PATH/bin/extract-image $BASE_IMAGE_FILE $BASE_IMAGE_TAR $IMAGE_LOCATION $CACHED_IMAGE

7
releasenotes/notes/rhel7-element-deprecation-b0c1b57be8cd06ac.yaml Normal file
View File

@ -0,0 +1,7 @@
---
deprecations:
- |
The rhel7 element is deprecated and is left only for backwards
compatibility. Use the `rhel` element instead. Note that you should set
DIB_RELEASE to 7 to indicate which release you are using. Please read the
notes.