Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Integer getuid() {
}

void fixup_rpmlintrc() {
if (env.SCONS_FAULTS_ARGS != 'BUILD_TYPE=dev') {
if (sconsArgs() != 'BUILD_TYPE=dev') {
return
}

Expand Down Expand Up @@ -200,7 +200,6 @@ pipeline {
TEST_RPMS = cachedCommitPragma(pragma: 'RPM-test', def_val: 'true')
COVFN_DISABLED = cachedCommitPragma(pragma: 'Skip-fnbullseye', def_val: 'true')
REPO_FILE_URL = repoFileUrl(env.REPO_FILE_URL)
SCONS_FAULTS_ARGS = sconsArgs()
HTTPS_PROXY = ''
PYTHON_VERSION = '3.11'
}
Expand Down Expand Up @@ -632,9 +631,11 @@ pipeline {
script: './ci/rpm/build_deps.sh'
job_step_update(
sconsBuild(parallel_build: true,
scons_args: sconsFaultsArgs() +
' PREFIX=/opt/daos TARGET_TYPE=release',
build_deps: 'yes'))
stash_files: 'ci/test_files_to_stash.txt',
build_deps: 'no',
stash_opt: true,
scons_args: sconsArgs() +
' PREFIX=/opt/daos TARGET_TYPE=release'))
sh label: 'Generate RPMs',
script: './ci/rpm/gen_rpms.sh suse.lp156 "' + env.DAOS_RELVAL + '"'
}
Expand Down
11 changes: 0 additions & 11 deletions ci/parse_ci_envs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,48 +8,38 @@ set -uex
if [ -n "${STAGE_NAME:?}" ]; then
case $STAGE_NAME in
*CentOS\ 7*|*el7*|*centos7*)
: "${CHROOT_NAME:=centos+epel-7-x86_64}"
: "${TARGET:=centos7}"
: "${REPO_SPEC:=el-7}"
;;
*CentOS\ 8*|*EL\ 8*|*el8*|*centos8*)
: "${CHROOT_NAME:=rocky+epel-8-x86_64}"
: "${TARGET:=centos8}"
: "${REPO_SPEC:=el-8}"
;;
*CentOS\ 9*|*EL\ 9*|*el9*|*centos9*)
: "${CHROOT_NAME:=rocky+epel-9-x86_64}"
: "${TARGET:=centos9}"
: "${REPO_SPEC:=el-9}"
;;
*Leap\ 15.6*|*leap15.6*|*opensuse15.6*|*sles15.6*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${TARGET:=leap15.6}"
;;
*Leap\ 15.5*|*leap15.5*|*opensuse15.5*|*sles15.5*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${TARGET:=leap15.5}"
;;
*Leap\ 15.4*|*leap15.4*|*opensuse15.4*|*sles15.4*)
: "${CHROOT_NAME:=opensuse-leap-15.4-x86_64}"
: "${TARGET:=leap15.4}"
;;
*Leap\ 15.3*|*leap15.3*|*opensuse15.3*|*sles15.3*)
: "${CHROOT_NAME:=opensuse-leap-15.3-x86_64}"
: "${TARGET:=leap15.3}"
;;
*Leap\ 15*|*leap15*|*opensuse15*|*sles15*)
: "${CHROOT_NAME:=opensuse-leap-15.5-x86_64}"
: "${TARGET:=leap15}"
: "${REPO_SPEC:=sl-15}"
;;
*Ubuntu\ 20.04*|*ubuntu2004*)
: "${CHROOT_NAME:="not_applicable"}"
: "${TARGET:=ubuntu20}"
: "${REPO_SPEC:=ubuntu-20.04}"
;;
*Ubuntu\ 22.04*|*ubuntu2204*)
: "${CHROOT_NAME:="not_applicable"}"
: "${TARGET:=ubuntu22}"
: "${REPO_SPEC:=ubuntu-22.04}"
;;
Expand All @@ -60,5 +50,4 @@ if [ -n "${STAGE_NAME:?}" ]; then
;;
esac
fi
export CHROOT_NAME
export TARGET
60 changes: 0 additions & 60 deletions ci/rpm/build.sh

This file was deleted.

36 changes: 1 addition & 35 deletions ci/rpm/build_success.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,53 +11,19 @@ if [ -e "${ci_envs}" ]; then
source "${ci_envs}"
fi

: "${CHROOT_NAME:=epel-7-x86_64}"
: "${TARGET:=centos7}"
: "${TARGET:=centos9}"

artdir="${PWD}/artifacts/${TARGET}"
rm -rf "$artdir"
mkdir -p "$artdir"
mkdir -p "$artdir/daos"

# ubuntu isn't complete since we don't have ubuntu stages
if [ -d /home/daos/pkgs/ ]; then
cp /home/daos/pkgs/*.deb "${artdir}"
pushd "$artdir"
dpkg-scanpackages . /dev/null | \
gzip -9c > Packages.gz
popd

exit 0
elif [ -d /var/cache/pbuilder/ ]; then
mockroot=/var/cache/pbuilder/
(if cd "$mockroot/result/"; then
cp ./*{.buildinfo,.changes,.deb,.dsc,.xz} "$artdir"
fi)
cp utils/rpms/_topdir/BUILD/*.orig.tar.* "$artdir"
pushd "$artdir"
dpkg-scanpackages . /dev/null | \
gzip -9c > Packages.gz
popd

exit 0
fi

if [ -d /home/daos/rpms/ ]; then
if [ -d /home/daos/rpms/deps ]; then
mkdir -p "$artdir/deps"
cp /home/daos/rpms/deps/*.rpm "${artdir}/deps"
fi
cp /home/daos/rpms/daos/*.rpm "${artdir}/daos"
else
mockroot="/var/lib/mock/${CHROOT_NAME}"
cat "$mockroot"/result/{root,build}.log 2>/dev/null || true

if srpms="$(ls _topdir/SRPMS/*)"; then
cp -af "$srpms" "$artdir"
fi
(if cd "$mockroot/result/"; then
cp -r . "$artdir"
fi)
fi

createrepo "$artdir"
43 changes: 0 additions & 43 deletions ci/rpm/build_unsuccessful.sh

This file was deleted.

37 changes: 0 additions & 37 deletions utils/rpms/Makefile

This file was deleted.

46 changes: 0 additions & 46 deletions utils/rpms/archive.sh

This file was deleted.

56 changes: 0 additions & 56 deletions utils/rpms/packaging/Dockerfile.centos.7

This file was deleted.

Loading
Loading