Skip to content

Update for CentOS7-vault element #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oneswig merged 1 commit into from
Feb 22, 2021
Merged

Update for CentOS7-vault element #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elements/centos7-vault/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ the baseline for built disk images.
DIB_CENTOS7_VERSION:
:Required: No
:Default: 7.6
:Description: Set a version, from 7.1 to 7.7 (inclusive) and the last-known
:Description: Set a version, from 7.1 to 7.9 (inclusive) and the last-known
public locations for package repos and cloud images will be used.

DIB_CENTOS7_MIRROR_VERSION:
Expand Down
21 changes: 20 additions & 1 deletion elements/centos7-vault/environment.d/10-centos7-distro-name.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,52 @@ export YUM=${YUM:-yum}
# At the time of writing CentOS 7.7 is still current and the vault content is incomplete.
export DIB_CENTOS7_VERSION=${DIB_CENTOS7_VERSION:-"7.6"}
case "$DIB_CENTOS7_VERSION" in
7.9)
# At the time of writing CentOS 7.9 is still current and the vault content is incomplete.
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.9.2009"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-2009"}
# The CentOS 7.9 cloud image appears to be have been published without the .qcow.xz
Copy link
Copy Markdown
Member

@dougszumski dougszumski Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strange, definitely seems to be the case

DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2c"
;;
7.8)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.8.2003"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-2003"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
7.7)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.7.1908"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1907"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
7.6)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.6.1810"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1811"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
7.5)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.5.1804"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1805"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
7.4)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.4.1708"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1708"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
7.3)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.3.1611"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1611"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
7.2)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.2.1511"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1511"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
7.1)
DIB_CENTOS7_MIRROR_VERSION=${DIB_CENTOS7_MIRROR_VERSION:-"7.1.1503"}
DIB_CENTOS7_CLOUDIMAGE_VERSION=${DIB_CENTOS7_CLOUDIMAGE_VERSION:-"GenericCloud-1503"}
DIB_CENTOS7_CLOUDIMAGE_EXT="qcow2.xz"
;;
*)
echo "CentOS 7 version \"$DIB_CENTOS7_VERSION\" is not recognised"
Expand All @@ -58,5 +77,5 @@ else
fi

export DIB_CENTOS7_MIRROR=${DIB_CENTOS7_MIRROR:-"http://vault.centos.org"}
export DIB_CENTOS7_CLOUDIMAGE_FILE=${DIB_CENTOS7_CLOUDIMAGE_FILE:-CentOS-7-${ARCH}-${DIB_CENTOS7_CLOUDIMAGE_VERSION}.qcow2.xz}
export DIB_CENTOS7_CLOUDIMAGE_FILE=${DIB_CENTOS7_CLOUDIMAGE_FILE:-CentOS-7-${ARCH}-${DIB_CENTOS7_CLOUDIMAGE_VERSION}.${DIB_CENTOS7_CLOUDIMAGE_EXT}}
export DIB_CENTOS7_CLOUDIMAGE=${DIB_CENTOS7_CLOUDIMAGE:-${DIB_CENTOS7_CLOUDIMAGE_REPO}/${DIB_CENTOS7_CLOUDIMAGE_FILE}}