Update various calls to mirrorlist.centos.org with vault.centos.org (#…

…3913) * Update various calls to mirrorlist.centos.org with vault.centos.org Mirrorlist has been deprecated following the EOL of Centos 7 Signed-off-by: Sophia Guo <[email protected]> * Remove non related variable Signed-off-by: Sophia Guo <[email protected]> * Update tooling/reproducible/linux_repro_build_compare.sh --------- Signed-off-by: Sophia Guo <[email protected]> Co-authored-by: Martijn Verburg <[email protected]>
adoptium · Aug 18, 2024 · 829e04f · 829e04f
1 parent e15beb1
commit 829e04f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/test/system/reproducibleCompare/playlist.xml b/test/system/reproducibleCompare/playlist.xml
@@ -18,13 +18,13 @@
 	<include>reproducible.mk</include>
 	<test>
 		<testCaseName>Rebuild_Same_JDK_Reproducibility_Test</testCaseName>
-		<command>docker container rm reproducibleCompare; \
+		<command>docker container rm -f reproducibleCompare; \
 	docker run -v "$(TEST_RESROOT):/home/jenkins/test" -w "/home/jenkins/" -v "$(TEST_JDK_HOME):/home/jenkins/jdkbinary/" --name reproducibleCompare centos:7 /bin/bash /home/jenkins/test/linux_repro_build_compare.sh $(SBOM_FILE) /home/jenkins/jdkbinary; \
 	$(TEST_STATUS); \
 	docker cp reproducibleCompare:/home/jenkins/reprotest.diff ./; \
 	docker cp reproducibleCompare:/home/jenkins/reproJDK.tar.gz ./; \
 	docker cp reproducibleCompare:/home/jenkins/SBOM.json ./; \
-	docker container rm reproducibleCompare
+	docker container rm -f reproducibleCompare
 	</command>
 		<levels>
 			<level>special</level>

diff --git a/tooling/reproducible/linux_repro_build_compare.sh b/tooling/reproducible/linux_repro_build_compare.sh
@@ -28,6 +28,9 @@ isJdkDir=false
 USING_DEVKIT="false"
 installPrereqs() {
   if test -r /etc/redhat-release; then
+    # Replace mirrorlist to vault as centos7 reached EOL.
+    sed -i -e 's!mirrorlist!#mirrorlist!g' /etc/yum.repos.d/CentOS-Base.repo
+    sed -i 's|#baseurl=http://mirror.centos.org/|baseurl=http://vault.centos.org/|' /etc/yum.repos.d/CentOS-Base.repo
     yum install -y gcc gcc-c++ make autoconf unzip zip alsa-lib-devel cups-devel libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel
     yum install -y file fontconfig fontconfig-devel systemtap-sdt-devel epel-release # Not included above ...
     yum install -y git bzip2 xz openssl pigz which jq # pigz/which not strictly needed but help in final compression