spdk/ci: added tar.gz package

Signed-off-by: Iaroslav Sydoruk <[email protected]>

Author: isdrk

.ci/Dockerfile.centos7.9.2009

@@ -5,7 +5,8 @@ ARG _LOGIN=swx-jenkins
 ARG _HOME=/var/home/$_LOGIN
 ARG MOFED_VER
 ENV LANG=en_US.utf-8
-ENV PATH=/opt/rh/devtoolset-8/root/usr/bin:$PATH
+ENV PATH=/opt/rh/devtoolset-8/root/usr/bin:/opt/rh/rh-git227/root/bin:$PATH
+ENV LD_LIBRARY_PATH=/opt/rh/httpd24/root/usr/lib64:$LD_LIBRARY_PATHPATH
 USER root
 
 RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*; \
@@ -23,6 +24,7 @@ RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-SCLo-*.repo; \
 RUN yum install -y \
     sudo \
     git \
+    rh-git227-git \
     vim \
     wget \
     fakeroot \

.ci/build_rpm.sh

@@ -36,32 +36,41 @@ fi
 #---
 # VladS asked to have "Revision" hardcoded into the SPEC file
 # So that we have to do inline editing
+if test -n "$ghprbPullId" ; then
+    REV="pr${ghprbPullId}"
+else
+    REV="${BUILD_NUMBER:-1}"
+fi
+
 OUT_SPEC=./spdk.spec
-sed -e "s#scm_rev %{_rev}#scm_rev ${BUILD_NUMBER:-1}#" scripts/spdk.spec > $OUT_SPEC
-sed -i "s#%{_date}#$_date#; s#%{_sha1}#$sha1#; s#%{_branch}#$branch# " $OUT_SPEC
+mv scripts/spdk.spec $OUT_SPEC 
+sed -i -e "s#scm_rev %{_rev}#scm_rev ${REV}#" $OUT_SPEC
+sed -i -e "s#%{_date}#$_date#; s#%{_sha1}#$sha1#; s#%{_branch}#$branch# " $OUT_SPEC
 
 git archive \
-    --format=tar --prefix=spdk-$VER/ -o $OUTDIR/spdk-$VER.tar HEAD
+	--format=tar --prefix=spdk-$VER/ -o $OUTDIR/spdk-$VER.tar HEAD -- ':!**/*.spec'
 generate_changelog
 
 pushd spdk-$VER
 apply_dpdk_patch
+cp ../spdk.spec .
 popd
 
 tar -uf  $OUTDIR/spdk-$VER.tar \
 	spdk-$VER/debian/changelog \
 	spdk-$VER/scripts/debian/changelog \
-	spdk-$VER/dpdk/config/arm/arm64_bluefield_linux_native_gcc
+	spdk-$VER/dpdk/config/arm/arm64_bluefield_linux_native_gcc \
+	spdk-$VER/spdk.spec
 
 git submodule init
 git submodule update
 
-for MOD in $(git submodule |awk '{print $2}')
-do
-  (cd $MOD;
-   git archive \
-    --format=tar --prefix=spdk-$VER/$MOD/ -o $OUTDIR/spdk-$MOD-$VER.tar  HEAD
-  )
+for MOD in $(git submodule | awk '{print $2}'); do
+	(
+		cd $MOD
+		git archive \
+			--format=tar --prefix=spdk-$VER/$MOD/ -o $OUTDIR/spdk-$MOD-$VER.tar HEAD -- ':!**/*.spec'
+	)
 done
 
 apply_dpdk_patch
@@ -71,7 +80,7 @@ do
     tar --concatenate --file=$OUTDIR/spdk-$VER.tar $OUTDIR/spdk-$MOD-$VER.tar
 done
 
-gzip -c $OUTDIR/spdk-$VER.tar >$OUTDIR/spdk-$VER.tar.gz
+gzip -c $OUTDIR/spdk-$VER.tar > $OUTDIR/spdk-$VER-${REV}.tar.gz
 
 # BUILD_NUMBER is an env var passed by Jenkins
 # https://stackoverflow.com/questions/16155792/using-jenkins-build-number-in-rpm-spec-file

.ci/job_matrix.yaml

@@ -66,6 +66,17 @@ steps:
     run: |
       .ci/upload.sh urm
 
+  - name: Upload tar package
+    containerSelector:
+      - "{name: 'rockylinux9_2', variant:1}"
+    credentialsId: 'svc-nbu-swx-repos'
+    run: |
+      if [[ "$(uname -m)" == "aarch64" ]]; then
+          .ci/upload.sh tar
+      else
+        exit 0
+      fi
+
 pipeline_stop:
   containerSelector:
       - "{name: 'ubuntu22_04'}"

.ci/upload.sh

@@ -101,6 +101,22 @@ upload_rpm_urm() {
     done
 }
 
+upload_tar_urm() {
+    pushd $HOME/rpmbuild/SOURCES
+    tar_pkg_url="${name}-${VER}-${REV}.tar.gz"
+    MD5=$(md5sum $tar_pkg_url | awk '{print $1}')
+    SHA1=$(shasum -a 1 $tar_pkg_url | awk '{ print $1 }')
+    SHA256=$(shasum -a 256 $tar_pkg_url | awk '{ print $1 }')
+    upload_url_urm="${REPO_URL}/${repo_name}/${tar_pkg_url}"
+    echo "INFO: Uploading package ${tar_pkg_url} to ${upload_url_urm}"
+    curl --fail -u "${REPO_USER}:${REPO_PASS}" -X PUT \
+        -H "X-Checksum-MD5:${MD5}" \
+        -H "X-Checksum-Sha1:${SHA1}" \
+        -H "X-Checksum-Sha256:${SHA256}" \
+        -T "${tar_pkg_url}" "${upload_url_urm}"
+    popd
+}
+
 bd=$(dirname $0)
 user=${USER:-root}
 : ${REPO_URL:?REPO_URL is not found!}
@@ -122,8 +138,8 @@ if command -v ofed_info >/dev/null 2>&1; then
     repo_name="${repo_name}-mlnx-ofed-${ofed_ver}"
 fi
 
-if test -n "$ghprbPullId" ; then
-    REV=${BUILD_NUMBER:-pr1}
+if test -n "$ghprbPullId"; then
+    REV="pr${ghprbPullId}"
     repo_name="${repo_name}-pr"
     STAGE="pr"
 else
@@ -153,6 +169,14 @@ elif [[ -f /etc/redhat-release || -f /etc/openEuler-release ]]; then
     if [ $1 == "urm" ]; then
         REPO_URL="${REPO_URL}/sw-nbu-swx-ci-rpm-local"
         upload_rpm_urm
+    elif [ $1 == "tar" ]; then
+        if [[ -f "$HOME/rpmbuild/SOURCES/${name}-$VER-$REV.tar.gz" ]]; then
+            REPO_URL="${REPO_URL}/sw-nbu-swx-ci-generic-local/packages/tar"
+            upload_tar_urm
+        else
+            echo "*.tar.gz file not found!"
+            exit 1
+        fi
     else
         echo "Repo not selected"
         exit 1

scripts/spdk.spec

@@ -1,6 +1,7 @@
 %define scm_version 23.01.5
 %define unmangled_version %{scm_version}
 %define scm_rev %{_rev}
+%define pkg_ver %{scm_version}-%{scm_rev}
 Epoch: 0
 
 %define pkg_prefix /opt/mellanox/spdk
@@ -15,7 +16,7 @@ Packager:       [email protected]
 Group:          System Environment/Daemons
 License:        BSD and LGPLv2 and GPLv2
 URL:            http://www.spdk.io
-Source0:        spdk-%{version}.tar.gz
+Source0:        spdk-%{pkg_ver}.tar.gz
 
 %define package_version %{epoch}:%{version}-%{release}
 %define install_datadir %{buildroot}/%{_datadir}/%{name}