|
1 |
| ---- 20.10.24.orig.sh 2023-05-05 16:40:09.913545090 +0000 |
2 |
| -+++ 20.10.24.sh 2023-05-05 16:40:09.921545089 +0000 |
| 1 | +--- 20.10.24.orig.sh 2023-05-08 14:45:20.378271328 +0530 |
| 2 | ++++ 20.10.24.sh 2023-05-08 14:44:46.431897959 +0530 |
3 | 3 | @@ -21,28 +21,34 @@
|
4 | 4 | # the script was uploaded (Should only be modified by upload job):
|
5 | 5 | SCRIPT_COMMIT_SHA="a8a6b338bdfedd7ddefb96fe3e7fe7d4036d945a"
|
|
94 | 94 | ;;
|
95 | 95 |
|
96 | 96 | *)
|
97 |
| -@@ -453,15 +478,23 @@ |
| 97 | +@@ -453,14 +478,18 @@ |
98 | 98 | set -x
|
99 | 99 | fi
|
100 | 100 | $sh_c "DEBIAN_FRONTEND=noninteractive apt-get install -y -qq $pkgs >/dev/null"
|
|
105 | 105 | exit 0
|
106 | 106 | ;;
|
107 | 107 | - centos|fedora|rhel)
|
| 108 | +- if [ "$(uname -m)" != "s390x" ] && [ "$lsb_dist" = "rhel" ]; then |
| 109 | +- echo "Packages for RHEL are currently only available for s390x." |
| 110 | +- exit 1 |
108 | 111 | + centos|fedora|rhel|ol|rocky)
|
109 |
| - if [ "$(uname -m)" != "s390x" ] && [ "$lsb_dist" = "rhel" ]; then |
110 |
| - echo "Packages for RHEL are currently only available for s390x." |
111 |
| - exit 1 |
112 |
| - fi |
113 | 112 | + # set vault.centos.or repo as CentOS8 is now EOL
|
114 | 113 | + if [ "$lsb_dist" = "centos" ] && [ "$dist_version" -ge "8" ]; then
|
115 | 114 | + $sh_c "find /etc/yum.repos.d -type f -exec sed -i 's/mirrorlist=http:\/\/mirrorlist.centos.org/\#mirrorlist=http:\/\/mirrorlist.centos.org/g' {} \;"
|
116 | 115 | + $sh_c "find /etc/yum.repos.d -type f -exec sed -i 's/\#baseurl=http:\/\/mirror.centos.org/baseurl=http:\/\/vault.centos.org/g' {} \;"
|
117 | 116 | + $sh_c "dnf swap centos-linux-repos centos-stream-repos -y"
|
118 |
| -+ fi |
| 117 | + fi |
119 | 118 | if [ "$lsb_dist" = "fedora" ]; then
|
120 | 119 | pkg_manager="dnf"
|
121 |
| - config_manager="dnf config-manager" |
122 |
| -@@ -478,6 +511,9 @@ |
| 120 | +@@ -478,6 +507,9 @@ |
123 | 121 | pkg_suffix="el"
|
124 | 122 | fi
|
125 | 123 | repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
|
126 |
| -+ if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ]; then |
| 124 | ++ if [ "$lsb_dist" = "ol" ] || [ "$lsb_dist" = "rocky" ] || [ "$lsb_dist" = "rhel" ]; then |
127 | 125 | + repo_file_url="$DOWNLOAD_URL/linux/centos/$REPO_FILE"
|
128 | 126 | + fi
|
129 | 127 | (
|
130 | 128 | if ! is_dry_run; then
|
131 | 129 | set -x
|
132 |
| -@@ -489,6 +525,25 @@ |
| 130 | +@@ -489,6 +521,25 @@ |
133 | 131 | $sh_c "$config_manager $disable_channel_flag docker-ce-*"
|
134 | 132 | $sh_c "$config_manager $enable_channel_flag docker-ce-$CHANNEL"
|
135 | 133 | fi
|
|
155 | 153 | $sh_c "$pkg_manager makecache"
|
156 | 154 | )
|
157 | 155 | pkg_version=""
|
158 |
| -@@ -548,8 +603,7 @@ |
| 156 | +@@ -548,8 +599,7 @@ |
159 | 157 | if [ "$dist_version" = "15.3" ]; then
|
160 | 158 | sles_version="SLE_15_SP3"
|
161 | 159 | else
|
|
165 | 163 | fi
|
166 | 164 | opensuse_repo="https://download.opensuse.org/repositories/security:SELinux/$sles_version/security:SELinux.repo"
|
167 | 165 | repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE"
|
168 |
| -@@ -615,10 +669,25 @@ |
| 166 | +@@ -615,10 +665,25 @@ |
169 | 167 | set -x
|
170 | 168 | fi
|
171 | 169 | $sh_c "zypper -q install -y $pkgs"
|
|
0 commit comments