build_inf_prepare_jenkins: remove installation of docker

[pti/rtp.git] / scripts / build_inf_centos / build_inf_prepare_jenkins.sh

diff --git a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
index f7a14b0..1eeb130 100755 (executable)
--- a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
+++ b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh
@@ -22,7 +22,8 @@ set -e -o pipefail
 # Variables
 #########################################################################
 WORKSPACE=""
-MIRROR_CONTAINER_IMG=infbuilder/inf-centos-mirror:2022.05-stx.6.0
+MIRROR_VER=stx-6.0
+MIRROR_CONTAINER_IMG=infbuilder/inf-centos-mirror:2022.05-${MIRROR_VER}
 
 #########################################################################
 # Common Functions
@@ -74,8 +75,8 @@ get_mirror () {
     echo_step_start
 
     docker pull ${MIRROR_CONTAINER_IMG}
-    docker create -ti --name inf-centos-mirror-${i} ${MIRROR_CONTAINER_IMG} sh
-    docker cp inf-centos-mirror:/mirror ${MIRROR_DIR}
+    docker create -ti --name inf-centos-mirror ${MIRROR_CONTAINER_IMG} sh
+    docker cp inf-centos-mirror:/mirror_${MIRROR_VER} ${MIRROR_DIR}
     docker rm inf-centos-mirror
 
     echo_step_end
@@ -85,14 +86,16 @@ get_mirror () {
 #########################################################################
 # Main process
 #########################################################################
+msg_step="Prepare for jenkins build"
+
 set -x
 export BUILD_GROUP="jenkins"
 export WGET_OPENDEV="wget --no-check-certificate"
 export LOCALDISK="${WORKSPACE}/localdisk"
 export MIRROR_DIR="${WORKSPACE}/mirror"
 
-sudo mkdir -p ${LOCALDISK}/loadbuild/mock-cache
-sudo mkdir -p ${LOCALDISK}/loadbuild/mock
+mkdir -p ${LOCALDISK}/loadbuild/mock-cache
+mkdir -p ${LOCALDISK}/loadbuild/mock
 mkdir -p ${LOCALDISK}/designer
 mkdir -p ${LOCALDISK}/loadbuild
 
@@ -119,13 +122,11 @@ sudo yum install -y \
     createrepo \
     createrepo_c \
     deltarpm \
-    docker-client \
     expat-devel \
     flex \
     isomd5sum \
     gcc \
     gettext \
-    git \
     libguestfs-tools \
     libtool \
     libxml2 \
@@ -295,3 +296,5 @@ sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY*
 
 # Try to continue a yum command even if a StarlingX repo is unavailable.
 sudo yum-config-manager --setopt=StarlingX\*.skip_if_unavailable=1 --save
+
+echo_step_end