Skip to content

SRE-2772 ci: get rid of Intel reference #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 2, 2025
Merged

SRE-2772 ci: get rid of Intel reference #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f33db8d
SRE-2772 ci: get rid of link to hpdd artifactory (#456)
grom72 Feb 28, 2025
6037ed0
SRE-2772 ci: remove remaining Intel references
grom72 Jun 16, 2025
76ca25e
Small fix
grom72 Jun 16, 2025
da67c8b
Merge branch 'master' into grom72/sre-2772-get-rid-of-intel-reference
grom72 Oct 7, 2025
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
2 changes: 1 addition & 1 deletion ci/provisioning/post_provision_config_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if [ -n "$repo_files_pr" ]; then
branch="${branch%:*}"
fi
# shellcheck disable=SC2034
REPO_FILE_URL="${JENKINS_URL:-https://build.hpdd.intel.com/}job/daos-do/job/repo-files/job/$branch/$build_number/artifact/"
REPO_FILE_URL="${JENKINS_URL:-http://jenkins-3.daos.hpc.amslabs.hpecorp.net/}job/daos-do/job/repo-files/job/$branch/$build_number/artifact/"
fi

. /etc/os-release
Expand Down
4 changes: 2 additions & 2 deletions ci/provisioning/post_provision_config_common_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ send_mail() {
echo "Host: $HOSTNAME"
echo ""
echo -e "$message"
} 2>&1 | mail -s "$subject" -r "$HOSTNAME"@intel.com "$recipients"
} 2>&1 | mail -s "$subject" -r "$HOSTNAME"@hpe.com "$recipients"
set -x
}

Expand Down Expand Up @@ -265,7 +265,7 @@ post_provision_config_nodes() {
fi

if $CONFIG_POWER_ONLY; then
rm -f "$REPOS_DIR"/*.hpdd.intel.com_job_daos-stack_job_*_job_*.repo
rm -f "$REPOS_DIR"/*.daos.hpc.amslabs.hpecorp.net_job_daos-stack_job_*_job_*.repo
time dnf -y erase fio fuse ior-hpc mpich-autoload \
ompi argobots cart daos daos-client dpdk \
fuse-libs libisa-l libpmemobj mercury mpich \
Expand Down
2 changes: 1 addition & 1 deletion ci/provisioning/post_provision_config_nodes_EL_8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ install_mofed() {
fi

# Add a repo to install MOFED RPMS
repo_url=https://artifactory.dc.hpdd.intel.com/artifactory/mlnx_ofed/"$MLNX_VER_NUM-rhel$gversion"-x86_64/
repo_url=https://artifactory.daos.hpc.amslabs.hpecorp.net/artifactory/mlnx_ofed/"$MLNX_VER_NUM-rhel$gversion"-x86_64/
dnf -y config-manager --add-repo="$repo_url"
curl -L -O "$repo_url"RPM-GPG-KEY-Mellanox
dnf -y config-manager --save --setopt="$(url_to_repo "$repo_url")".gpgcheck=1
Expand Down
4 changes: 2 additions & 2 deletions vars/provisionNodesV1.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ EOF'''
if (config['power_only']) {
// Since we don't have CORCI-711 yet, erase things we know could have
// been put on the node previously
provision_script += '''\nrm -f /etc/yum.repos.d/*.hpdd.intel.com_job_daos-stack_job_*_job_*.repo
provision_script += '''\nrm -f /etc/yum.repos.d/*.daos.hpc.amslabs.hpecorp.net_job_daos-stack_job_*_job_*.repo
yum -y erase fio fuse ior-hpc mpich-autoload''' +
' ompi argobots cart daos daos-client dpdk ' +
' fuse-libs libisa-l libpmemobj mercury mpich' +
Expand Down Expand Up @@ -239,7 +239,7 @@ EOF'''
if (inst_repos) {
provision_script += '\n' + iterate_repos +
'''\nyum-config-manager --add-repo=''' + env.JENKINS_URL + '''job/daos-stack/job/\\\${repo}/job/\\\${branch//\\//%252F}/\\\${build_number}/artifact/artifacts/centos7/
pname=\\\$(ls /etc/yum.repos.d/*.hpdd.intel.com_job_daos-stack_job_\\\${repo}_job_\\\${branch//\\//%252F}_\\\${build_number}_artifact_artifacts_centos7_.repo)
pname=\\\$(ls /etc/yum.repos.d/*.daos.hpc.amslabs.hpecorp.net_job_daos-stack_job_\\\${repo}_job_\\\${branch//\\//%252F}_\\\${build_number}_artifact_artifacts_centos7_.repo)
if [ "\\\$pname" != "\\\${pname//%252F/_}" ]; then
mv "\\\$pname" "\\\${pname//%252F/_}"
fi
Expand Down
2 changes: 1 addition & 1 deletion vars/stepResult.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Void call(Map config= [:]) {
'\n\nIf you are receiving this e-mail, about a PR that is not yours, it is\n' +
'in error.\n\n' +
'Please accept my appologies and kindly forward this message to\n' +
'brian.murrell@intel.com for investigation.\n\n' +
'john.malmberg@hpe.com for investigation.\n\n' +
'Thank-you.\n\n\n' +
/* groovylint-disable-next-line GStringExpressionWithinString */
'BUILD_NUMBER=${BUILD_NUMBER}\n' +
Expand Down