Skip to content

Commit a7e4cfc

Browse files
committed
Add code needed to use custom path for weekly build files
Quick-Functional: true Run-GHA: true Required-githooks: true Skip-build: true Skip-test: true Skip-unit-tests: true Signed-off-by: Margaret Lawson <mlawsonca@google.com>
1 parent a013c67 commit a7e4cfc

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.github/actions/provision-cluster/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ runs:
5353
inst_repos+=" daos@PR-${{ github.event.pull_request.number }}"
5454
inst_repos+=":${{ github.run_number }}"
5555
fi
56+
REPO_PATH=$(get_repo_path)$TARGET"
5657
ARTIFACTS_URL=$ARTIFACTS_URL \
5758
INST_REPOS="$(eval echo "$inst_repos")" \
59+
REPO_PATH=$REPO_PATH \
5860
DISTRO=$PROVISION_DISTRO ci/provisioning/post_provision_config.sh

.github/workflows/gcp-weekly.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ jobs:
225225
JENKINS_URL: https://build.hpdd.intel.com/
226226
REPOSITORY_URL: https://repo.dc.hpdd.intel.com/
227227
REMOVE_EXISTING_RPMS: false
228+
TARGET: ${{ matrix.distro }}
229+
REPO_PATH: /scratch/job_repos/daos-stack/job/daos/job/gcp-weekly-${{ github.run_id }}/
228230
# TODO -- this should be on stable, backedup storage
229231
ARTIFACTS_URL: file:///scratch/job_repos/
230232
REPO_FILE_URL: https://artifactory.dc.hpdd.intel.com/artifactory/repo-files/
@@ -393,6 +395,7 @@ jobs:
393395
(needs.Functional.result == 'success' ||
394396
needs.Functional.result == 'skipped')
395397
env:
398+
TARGET: el8
396399
CONFIG_POWER_ONLY: false
397400
PRAGMA_SUFFIX: -vm
398401
OPERATIONS_EMAIL: brian.murrell@intel.com

ci/provisioning/post_provision_config_common_functions.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,8 @@ post_provision_config_nodes() {
370370
branch="${branch%:*}"
371371
fi
372372
fi
373-
local repo_url="${ARTIFACTS_URL:-${JENKINS_URL}job/}"daos-stack/job/"$repo"/job/"${branch//\//%252F}"/"$build_number"/artifact/artifacts/$DISTRO_NAME/
373+
374+
local repo_url="${REPO_PATH:-${ARTIFACTS_URL:-${JENKINS_URL}job/}daos-stack/job/$repo/job/${branch//\//%252F}/$build_number/artifact/artifacts/$DISTRO_NAME/}"
374375
dnf -y config-manager --add-repo="$repo_url"
375376
repo="$(url_to_repo "$repo_url")"
376377
# PR-repos: should always be able to upgrade modular packages

0 commit comments

Comments
 (0)