Skip to content

Commit

Permalink
Add code needed to use custom path for weekly build files
Browse files Browse the repository at this point in the history
Quick-Functional: true
Run-GHA: true
Required-githooks: true
Skip-build: true
Skip-test: true
Skip-unit-tests: true

Signed-off-by: Margaret Lawson <[email protected]>
  • Loading branch information
mlawsonca committed Jan 22, 2025
1 parent a013c67 commit ec9b0c2
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/actions/provision-cluster/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ runs:
inst_repos+=" daos@PR-${{ github.event.pull_request.number }}"
inst_repos+=":${{ github.run_number }}"
fi
REPO_PATH=$(get_repo_path)$TARGET"
ARTIFACTS_URL=$ARTIFACTS_URL \
INST_REPOS="$(eval echo "$inst_repos")" \
REPO_PATH=$REPO_PATH \
DISTRO=$PROVISION_DISTRO ci/provisioning/post_provision_config.sh
3 changes: 3 additions & 0 deletions .github/workflows/gcp-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ jobs:
JENKINS_URL: https://build.hpdd.intel.com/
REPOSITORY_URL: https://repo.dc.hpdd.intel.com/
REMOVE_EXISTING_RPMS: false
TARGET: ${{ matrix.distro }}
REPO_PATH: /scratch/job_repos/daos-stack/job/daos/job/gcp-weekly-${{ github.run_id }}/
# 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/
Expand Down Expand Up @@ -393,6 +395,7 @@ jobs:
(needs.Functional.result == 'success' ||
needs.Functional.result == 'skipped')
env:
TARGET: el8
CONFIG_POWER_ONLY: false
PRAGMA_SUFFIX: -vm
OPERATIONS_EMAIL: [email protected]
Expand Down
3 changes: 2 additions & 1 deletion ci/provisioning/post_provision_config_common_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,8 @@ post_provision_config_nodes() {
branch="${branch%:*}"
fi
fi
local repo_url="${ARTIFACTS_URL:-${JENKINS_URL}job/}"daos-stack/job/"$repo"/job/"${branch//\//%252F}"/"$build_number"/artifact/artifacts/$DISTRO_NAME/

local repo_url="${REPO_PATH:-${ARTIFACTS_URL:-${JENKINS_URL}job/}daos-stack/job/$repo/job/${branch//\//%252F}/$build_number/artifact/artifacts/$DISTRO_NAME/}"
dnf -y config-manager --add-repo="$repo_url"
repo="$(url_to_repo "$repo_url")"
# PR-repos: should always be able to upgrade modular packages
Expand Down
16 changes: 16 additions & 0 deletions temp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

set -eux

temp() {
local results_files
results_files=($(find . -maxdepth 1 -name "results.xml.*"))

if [ ${#results_files[@]} -eq 0 ]; then
echo "No results found to report as JUnit results"
ls -l
return
fi
}

temp

0 comments on commit ec9b0c2

Please sign in to comment.