Skip to content

(oracle-linux-image-tools): Updates for OL8U8 and OL9U2 #88

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
merged 5 commits into from
May 26, 2023
Merged

(oracle-linux-image-tools): Updates for OL8U8 and OL9U2 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8f6f61
feat(olit): :sparkles: OL9U2 support
AmedeeBulle May 17, 2023
5a0593b
fix(olit): :bug: reset yum/dnf ocidomain variable
AmedeeBulle May 22, 2023
39b756c
feat(olit): :sparkles: Updates for OL8u8
AmedeeBulle May 24, 2023
08129d0
chore(olit): :lipstick: avoid false positive secret scanning
AmedeeBulle May 26, 2023
9aecb52
docs(olit): :pencil2: fix typo
AmedeeBulle May 26, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions oracle-linux-image-tools/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ The tool currently supports:

- Distributions:
- Oracle Linux 7 update 9 -- Slim (x86_64)
- Oracle Linux 8 update 6 -- Slim (x86_64 and aarch64)
- Oracle Linux 8 update 8 -- Slim (x86_64 and aarch64)
__Note__: for aarch64, only Generic, OCI and UTM clouds are supported
- Oracle Linux 9 update 0 -- Slim (x86_64 and aarch64)
- Oracle Linux 9 update 2 -- Slim (x86_64 and aarch64)
__Note__: for aarch64, only Generic, OCI and UTM clouds are supported
- Clouds:
- Microsoft Azure cloud
Expand Down Expand Up @@ -96,7 +96,7 @@ In that case, you will have to provide an URL to an installation tree and option
Example for an Oracle Linux 9 using the UEK boot ISO:

```Shell
ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u0/x86_64/OracleLinux-R9-U0-x86_64-boot-uek.iso"
ISO_URL="https://yum.oracle.com/ISOS/OracleLinux/OL9/u2/x86_64/OracleLinux-R9-U2-x86_64-boot-uek.iso"
REPO_URL="https://yum.oracle.com/repo/OracleLinux/OL9/baseos/latest/x86_64"
REPO[AppStream]="https://yum.oracle.com/repo/OracleLinux/OL9/appstream/x86_64"
REPO[ol9_UEKR7]="https://yum.oracle.com/repo/OracleLinux/OL9/UEKR7/x86_64"
Expand Down
2 changes: 1 addition & 1 deletion oracle-linux-image-tools/cloud/utm/config.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<true/>
<key>Notes</key>
<string>Default user/initial password: opc/opc
Root password: locked</string>
Root account: locked</string>
</dict>
<key>Input</key>
<dict>
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol7-slim/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ distr::cleanup() {
echo_message "Yum cleanup"
yum -q repolist > "${BUILD_INFO}/repolist.txt"
: > /etc/yum/vars/ociregion
echo "oracle.com" > /etc/yum/vars/ocidomain
rm -rf /var/cache/yum/*
rm -rf /var/lib/yum/*
find /etc/ -name "./*.uln-*" -exec rm -rf {} \;
Expand Down
4 changes: 2 additions & 2 deletions oracle-linux-image-tools/distr/ol8-aarch64/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL8U7_aarch64"
DISTR_NAME="OL8U8_aarch64"

# Distribution release
readonly ORACLE_RELEASE=8
Expand All @@ -15,7 +15,7 @@ SETUP_SWAP="yes"
ROOT_FS="xfs"

# Label of the ISO image
ISO_LABEL="OL-8-7-0-BaseOS-aarch64"
ISO_LABEL="OL-8-8-0-BaseOS-aarch64"

# Boot command
# Variables MUST be escaped as they are evaluated at build time.
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol8-aarch64/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ distr::cleanup() {
echo_message "Dnf cleanup"
dnf -q repolist > "${BUILD_INFO}/repolist.txt"
: > /etc/dnf/vars/ociregion
echo "oracle.com" > /etc/dnf/vars/ocidomain
rm -rf /var/cache/dnf/*
rm -rf /var/lib/dnf/*
find /etc/ -name "./*.uln-*" -exec rm -rf {} \;
Expand Down
2 changes: 1 addition & 1 deletion oracle-linux-image-tools/distr/ol8-slim/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL8U7_x86_64"
DISTR_NAME="OL8U8_x86_64"

# Distribution release
readonly ORACLE_RELEASE=8
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol8-slim/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ distr::cleanup() {
echo_message "Dnf cleanup"
dnf -q repolist > "${BUILD_INFO}/repolist.txt"
: > /etc/dnf/vars/ociregion
echo "oracle.com" > /etc/dnf/vars/ocidomain
rm -rf /var/cache/dnf/*
rm -rf /var/lib/dnf/*
find /etc/ -name "./*.uln-*" -exec rm -rf {} \;
Expand Down
4 changes: 2 additions & 2 deletions oracle-linux-image-tools/distr/ol9-aarch64/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL9U1_aarch64"
DISTR_NAME="OL9U2_aarch64"

# Distribution release
readonly ORACLE_RELEASE=9
Expand All @@ -15,7 +15,7 @@ SETUP_SWAP="yes"
ROOT_FS="xfs"

# Label of the ISO image
ISO_LABEL="OL-9-1-0-BaseOS-aarch64"
ISO_LABEL="OL-9-2-0-BaseOS-aarch64"

# Boot command
# Variables MUST be escaped as they are evaluated at build time.
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol9-aarch64/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ distr::cleanup() {
echo_message "Dnf cleanup"
dnf -q repolist > "${BUILD_INFO}/repolist.txt"
: > /etc/dnf/vars/ociregion
echo "oracle.com" > /etc/dnf/vars/ocidomain
rm -rf /var/cache/dnf/*
rm -rf /var/lib/dnf/*
find /etc/ -name "./*.uln-*" -exec rm -rf {} \;
Expand Down
2 changes: 1 addition & 1 deletion oracle-linux-image-tools/distr/ol9-slim/env.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# env file.

# Distribution name
DISTR_NAME="OL9U1_x86_64"
DISTR_NAME="OL9U2_x86_64"

# Distribution release
readonly ORACLE_RELEASE=9
Expand Down
1 change: 1 addition & 0 deletions oracle-linux-image-tools/distr/ol9-slim/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ distr::cleanup() {
echo_message "Dnf cleanup"
dnf -q repolist > "${BUILD_INFO}/repolist.txt"
: > /etc/dnf/vars/ociregion
echo "oracle.com" > /etc/dnf/vars/ocidomain
rm -rf /var/cache/dnf/*
rm -rf /var/lib/dnf/*
find /etc/ -name "./*.uln-*" -exec rm -rf {} \;
Expand Down