From 4adde28cec7b585726b17672d0ce0ac4687eb1cd Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 17 Sep 2025 09:20:49 +0200 Subject: [PATCH 1/3] SRE-2772 ci: remove all references to hpdd.intel.com Also enable Jenkins githook as Jenkins is back operational. Signed-off-by: Tomasz Gromadzki --- .github/workflows/bullseye-coverage.yml | 16 ++++++++-------- .github/workflows/rpm-build-and-test.yml | 16 ++++++++-------- ci/functional/launchable_analysis | 2 +- ci/gha_functions.sh | 2 +- ci/provisioning/post_provision_config_common.sh | 2 +- utils/githooks/pre-commit.d/30-Jenkinsfile.sh | 8 +------- utils/rpms/packaging/Makefile_packaging.mk | 2 +- utils/rpms/packaging/debian_chrootbuild | 2 +- utils/rpms/packaging/rpm_chrootbuild | 4 ++-- 9 files changed, 24 insertions(+), 30 deletions(-) diff --git a/.github/workflows/bullseye-coverage.yml b/.github/workflows/bullseye-coverage.yml index 732db78d373..0ac5fc6257c 100644 --- a/.github/workflows/bullseye-coverage.yml +++ b/.github/workflows/bullseye-coverage.yml @@ -201,15 +201,15 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: brian.murrell@intel.com + OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} - JENKINS_URL: https://build.hpdd.intel.com/ - REPOSITORY_URL: https://repo.dc.hpdd.intel.com/ + JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ + REPOSITORY_URL: https://nexus.daos.hpc.amslabs.hpecorp.net/repository REMOVE_EXISTING_RPMS: false # TODO -- this should be on stable, backedup storage ARTIFACTS_URL: file:///scratch/job_repos/ - REPO_FILE_URL: https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/ + REPO_FILE_URL: https://artifactory.daos.hpc.amslabs.hpecorp.net/artifactory/repo-files/ # keep VS Code's GHA linting happy NODESTRING: CP_PR_REPOS: @@ -491,15 +491,15 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: brian.murrell@intel.com + OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} - JENKINS_URL: https://build.hpdd.intel.com/ - REPOSITORY_URL: https://repo.dc.hpdd.intel.com/ + JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ + REPOSITORY_URL: https://nexus.daos.hpc.amslabs.hpecorp.net/repository REMOVE_EXISTING_RPMS: false # TODO -- this should be on stable, backedup storage ARTIFACTS_URL: file:///scratch/job_repos/ - REPO_FILE_URL: https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/ + REPO_FILE_URL: https://artifactory.daos.hpc.amslabs.hpecorp.net/artifactory/repo-files/ # keep VS Code's GHA linting happy NODESTRING: CP_PR_REPOS: diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml index ba5834c279f..73479ab7905 100644 --- a/.github/workflows/rpm-build-and-test.yml +++ b/.github/workflows/rpm-build-and-test.yml @@ -210,15 +210,15 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: brian.murrell@intel.com + OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} - JENKINS_URL: https://build.hpdd.intel.com/ - REPOSITORY_URL: https://repo.dc.hpdd.intel.com/ + JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ + REPOSITORY_URL: https://nexus.daos.hpc.amslabs.hpecorp.net/repository REMOVE_EXISTING_RPMS: false # TODO -- this should be on stable, backedup storage ARTIFACTS_URL: file:///scratch/job_repos/ - REPO_FILE_URL: https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/ + REPO_FILE_URL: https://artifactory.daos.hpc.amslabs.hpecorp.net/artifactory/repo-files/ # keep VS Code's GHA linting happy NODESTRING: CP_PR_REPOS: @@ -500,15 +500,15 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: brian.murrell@intel.com + OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} - JENKINS_URL: https://build.hpdd.intel.com/ - REPOSITORY_URL: https://repo.dc.hpdd.intel.com/ + JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ + REPOSITORY_URL: https://nexus.daos.hpc.amslabs.hpecorp.net/repository REMOVE_EXISTING_RPMS: false # TODO -- this should be on stable, backedup storage ARTIFACTS_URL: file:///scratch/job_repos/ - REPO_FILE_URL: https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/ + REPO_FILE_URL: https://artifactory.daos.hpc.amslabs.hpecorp.net/artifactory/repo-files/ # keep VS Code's GHA linting happy NODESTRING: CP_PR_REPOS: diff --git a/ci/functional/launchable_analysis b/ci/functional/launchable_analysis index eb62caa3648..c140c1a87d4 100755 --- a/ci/functional/launchable_analysis +++ b/ci/functional/launchable_analysis @@ -57,5 +57,5 @@ if $notify; then env | sort | grep ^CHANGE_ echo echo "See details in $dir." - } | mail -r "$HOSTNAME"@intel.com -s "Launchable prediction failure: ${not_predicted_percent}%" brian.murrell@intel.com + } | mail -r "$HOSTNAME"@hpe.com -s "Launchable prediction failure: ${not_predicted_percent}%" tomasz.gromadzki@hpe.com fi diff --git a/ci/gha_functions.sh b/ci/gha_functions.sh index 7c861f67a23..7994a264be4 100644 --- a/ci/gha_functions.sh +++ b/ci/gha_functions.sh @@ -234,6 +234,6 @@ test_test_tag_and_features() { } #test_jenkins_curl() { -# JENKINS_URL="${JENKINS_URL:-https://build.hpdd.intel.com/}" +# JENKINS_URL="${JENKINS_URL:-https://jenkins.daos.hpc.amslabs.hpecorp.net/}" # assert_equals "$(QUIET=true VERBOSE=false jenkins_curl -X POST "${JENKINS_URL}api/xml" 3>&1 >/dev/null | tr -d '\r' | grep '^X-Content-Type-Options:')" "X-Content-Type-Options: nosniff" #} diff --git a/ci/provisioning/post_provision_config_common.sh b/ci/provisioning/post_provision_config_common.sh index d5300fd3a8f..3e410d20913 100755 --- a/ci/provisioning/post_provision_config_common.sh +++ b/ci/provisioning/post_provision_config_common.sh @@ -26,7 +26,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:-https://jenkins.daos.hpc.amslabs.hpecorp.net/}job/daos-do/job/repo-files/job/$branch/$build_number/artifact/" fi # shellcheck disable=SC1091 diff --git a/utils/githooks/pre-commit.d/30-Jenkinsfile.sh b/utils/githooks/pre-commit.d/30-Jenkinsfile.sh index c3ca4c7c5ab..e508ee869ac 100755 --- a/utils/githooks/pre-commit.d/30-Jenkinsfile.sh +++ b/utils/githooks/pre-commit.d/30-Jenkinsfile.sh @@ -21,14 +21,8 @@ if [ -z "$(_git_diff_cached_files "Jenkinsfile")" ] ; then exit 0 fi -echo "Temporary skipping as the old Jenkins instance is not accessible" -echo "Pre-hook will be restored after new instance of Jenkins will be fully operational" -exit 0 - echo "Checking syntax" -: "${JENKINS_HOST:=build.hpdd.intel.com}" -echo "Temporary no access to $JENKINS_HOST. Skipping" -exit 0 +: "${JENKINS_HOST:=jenkins.daos.hpc.amslabs.hpecorp.net}" # shellcheck disable=SC2317 if ! ping -c 1 "$JENKINS_HOST" &> /dev/null; then echo "Failed to access $JENKINS_HOST. Skipping" diff --git a/utils/rpms/packaging/Makefile_packaging.mk b/utils/rpms/packaging/Makefile_packaging.mk index 75038c1178f..0ea700e545e 100644 --- a/utils/rpms/packaging/Makefile_packaging.mk +++ b/utils/rpms/packaging/Makefile_packaging.mk @@ -130,7 +130,7 @@ define install_repos fi; \ fi; \ $(call distro_map) \ - baseurl=$${JENKINS_URL:-https://build.hpdd.intel.com/}job/daos-stack/job/$$repo/job/$$branch/; \ + baseurl=$${JENKINS_URL:-https://jenkins.daos.hpc.amslabs.hpecorp.net/}job/daos-stack/job/$$repo/job/$$branch/; \ baseurl+=$$build_number/artifact/artifacts/$$distro/; \ $(call install_repo,$$baseurl) \ done diff --git a/utils/rpms/packaging/debian_chrootbuild b/utils/rpms/packaging/debian_chrootbuild index cc2cc96d8b0..c768b719e25 100755 --- a/utils/rpms/packaging/debian_chrootbuild +++ b/utils/rpms/packaging/debian_chrootbuild @@ -29,7 +29,7 @@ for repo in $DISTRO_BASE_PR_REPOS $PR_REPOS; do continue fi repos_added+=("$repo") - repo_args="$repo_args|deb [trusted=yes] ${JENKINS_URL:-https://build.hpdd.intel.com/}job/daos-stack/job/$repo/job/$branch/$build_number/artifact/artifacts/$DISTRO/ ./" + repo_args="$repo_args|deb [trusted=yes] ${JENKINS_URL:-https://jenkins.daos.hpc.amslabs.hpecorp.net/}job/daos-stack/job/$repo/job/$branch/$build_number/artifact/artifacts/$DISTRO/ ./" done repo_args+="|$(curl -sSf "$REPO_FILE_URL"daos_ci-"$DISTRO"-artifactory.list | diff --git a/utils/rpms/packaging/rpm_chrootbuild b/utils/rpms/packaging/rpm_chrootbuild index 250eee810ba..22eabcbf3e0 100755 --- a/utils/rpms/packaging/rpm_chrootbuild +++ b/utils/rpms/packaging/rpm_chrootbuild @@ -67,7 +67,7 @@ if [ -n "${ARTIFACTORY_URL:-}" ] && "$LOCAL_REPOS"; then build_number="${branch#*:}" branch="${branch%:*}" fi - 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:-https://jenkins.daos.hpc.amslabs.hpecorp.net/}job/daos-do/job/repo-files/job/$branch/$build_number/artifact/" else if [ ! -d "$REPO_FILES_PR" ]; then echo "Could not find your specified directory \"$REPO_FILES_PR\" to read repo-files from" @@ -101,7 +101,7 @@ for repo in $DISTRO_BASE_PR_REPOS $PR_REPOS; do repo_adds+=("--enablerepo $repo:${branch//[@\/]/_}:$build_number") echo -e "[$repo:${branch//[@\/]/_}:$build_number]\n\ name=$repo:${branch//[@\/]/_}:$build_number\n\ -baseurl=${ARTIFACTS_URL:-${JENKINS_URL:-https://build.hpdd.intel.com/}job/}daos-stack/job/$repo/job/${branch//\//%2F}/$build_number/artifact/artifacts/$DISTRO/\n\ +baseurl=${ARTIFACTS_URL:-${JENKINS_URL:-https://jenkins.daos.hpc.amslabs.hpecorp.net/}job/}daos-stack/job/$repo/job/${branch//\//%2F}/$build_number/artifact/artifacts/$DISTRO/\n\ enabled=1\n\ gpgcheck=False\n" >> mock.cfg done From 0e71b650bb85e844f70fe2976f2935291d8f80ff Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 22 Sep 2025 20:28:37 +0200 Subject: [PATCH 2/3] Fix: use group instead of personal e-mail Doc-only: true Signed-off-by: Tomasz Gromadzki --- .github/workflows/bullseye-coverage.yml | 4 ++-- .github/workflows/rpm-build-and-test.yml | 4 ++-- ci/functional/launchable_analysis | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bullseye-coverage.yml b/.github/workflows/bullseye-coverage.yml index 0ac5fc6257c..99c4ff0c419 100644 --- a/.github/workflows/bullseye-coverage.yml +++ b/.github/workflows/bullseye-coverage.yml @@ -201,7 +201,7 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com + OPERATIONS_EMAIL: core-daos-devops@groups.int.hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ @@ -491,7 +491,7 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com + OPERATIONS_EMAIL: core-daos-devops@groups.int.hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ diff --git a/.github/workflows/rpm-build-and-test.yml b/.github/workflows/rpm-build-and-test.yml index 73479ab7905..ff35ac86fd4 100644 --- a/.github/workflows/rpm-build-and-test.yml +++ b/.github/workflows/rpm-build-and-test.yml @@ -210,7 +210,7 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com + OPERATIONS_EMAIL: core-daos-devops@groups.int.hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ @@ -500,7 +500,7 @@ jobs: env: CONFIG_POWER_ONLY: false PRAGMA_SUFFIX: -vm - OPERATIONS_EMAIL: tomasz.gromadzki@hpe.com + OPERATIONS_EMAIL: core-daos-devops@groups.int.hpe.com TEST_RPMS: true COMMIT_MESSAGE: ${{ needs.Call-RPM-Build.outputs.commit-message }} JENKINS_URL: https://jenkins.daos.hpc.amslabs.hpecorp.net/ diff --git a/ci/functional/launchable_analysis b/ci/functional/launchable_analysis index c140c1a87d4..9b40db9c396 100755 --- a/ci/functional/launchable_analysis +++ b/ci/functional/launchable_analysis @@ -57,5 +57,5 @@ if $notify; then env | sort | grep ^CHANGE_ echo echo "See details in $dir." - } | mail -r "$HOSTNAME"@hpe.com -s "Launchable prediction failure: ${not_predicted_percent}%" tomasz.gromadzki@hpe.com + } | mail -r "$HOSTNAME"@hpe.com -s "Launchable prediction failure: ${not_predicted_percent}%" core-daos-devops@groups.int.hpe.com fi From c28231c8109c019153a0af27db51b6f8014d6829 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 22 Sep 2025 20:39:33 +0200 Subject: [PATCH 3/3] Build trigger Signed-off-by: Tomasz Gromadzki