Skip to content
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

Jump to bottom

CI driver_weekly bugfix deleting new branch if is already on repo #1899

Merged
merged 10 commits into from
Oct 4, 2023
Merged

CI driver_weekly bugfix deleting new branch if is already on repo #1899

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a71e3ee
driver_weekly bugfix deleting new branch if is already on repo
TerryMcGuinness-NOAA Sep 29, 2023
2cf4b21
Update driver_weekly.sh
TerrenceMcGuinness-NOAA Sep 29, 2023
d7dc0d0
Merge branch 'NOAA-EMC:develop' into CI-bugfix-driver_weekly
TerrenceMcGuinness-NOAA Oct 3, 2023
d52ab83
changed REPO_OWNER away from NOAA-EMC so that intermediary branch doe…
TerryMcGuinness-NOAA Oct 3, 2023
f8ecb12
updated driver_weely so that intermediary branch is stored in emcbot
TerryMcGuinness-NOAA Oct 3, 2023
d51f174
micro update for remote name for pushing weekly update brandh to emcb…
TerryMcGuinness-NOAA Oct 4, 2023
694a91b
picked up two other name chages in remote stream for pushing the emcb…
TerryMcGuinness-NOAA Oct 4, 2023
aba1b14
rats -- spelled REMOTE worng .. fixed
TerryMcGuinness-NOAA Oct 4, 2023
286993d
Update driver_weekly.sh
TerrenceMcGuinness-NOAA Oct 4, 2023
e1939e0
Update driver_weekly.sh
TerrenceMcGuinness-NOAA Oct 4, 2023
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
27 changes: 20 additions & 7 deletions ci/scripts/driver_weekly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -eux
# TODO using static build for GitHub CLI until fixed in HPC-Stack
#################################################################
export GH=${HOME}/bin/gh
export REPO_URL=${REPO_URL:-"https://github.com/NOAA-EMC/global-workflow.git"}
export REPO_URL="ssh://git@ssh.github.com:443/NOAA-EMC/global-workflow.git"
TerrenceMcGuinness-NOAA marked this conversation as resolved.
Show resolved Hide resolved

################################################################
# Setup the relative paths to scripts and PS4 for better logging
Expand Down Expand Up @@ -61,7 +61,7 @@ set -x
# Create a new branch from develop and move yaml files
#########################################################
branch="weekly_ci_$(date +%Y%m%d)"
develop_dir="${GFS_CI_ROOT}/develop_temp"
develop_dir="${GFS_CI_ROOT}/develop_weekly"
echo "Creating new branch ${branch} from develop on ${MACHINE_ID} in ${develop_dir}"
rm -Rf "${develop_dir}"
mkdir -p "${develop_dir}"
Expand All @@ -73,26 +73,39 @@ git checkout -b "${branch}"
######################################################
# move yaml files from ci/cases/weekly to ci/cases/pr
# and push new branch for PR weekly CI tests to GitHub
REPO_OWNER="emcbot"
REPO_NAME="global-workflow"
REMOTE_NAME="${REPO_OWNER}"

rm -Rf ci/cases/pr
mv ci/cases/weekly ci/cases/pr
git add ci/cases
git commit -m "Moved weekly cases files into pr for high resolution testing"
git push --set-upstream origin "${branch}"

git remote add "${REMOTE_NAME}" "[email protected]:${REPO_OWNER}/${REPO_NAME}.git"

set +e
# Delete the branch if it exists
git ls-remote --exit-code upstream "${branch}"
ci_status=$?
if [[ "${ci_status}" == '0' ]]; then
git push "${REMOTE_NAME}" --delete "${branch}"
fi
set -e

git push --set-upstream "${REMOTE_NAME}" "${branch}"

####################################################################
# Create Pull Request using GitHub CLI and add labels for CI testing
####################################################################

REPO_OWNER="NOAA-EMC"
REPO_NAME="global-workflow"
HEAD_BRANCH="${REPO_OWNER}:${branch}"
BASE_BRANCH="develop"
HEAD_BRANCH="${branch}"
PULL_REQUEST_TITLE="[DO NOT MERGE] Weekly High Resolution CI Tests $(date +'%A %b %d, %Y')"
PULL_REQUEST_BODY="${PULL_REQUEST_TITLE}"
PULL_REQUEST_LABELS=("CI/CD" "CI-Orion-Ready" "CI-Hera-Ready")

"${GH}" repo set-default "${REPO_OWNER}/${REPO_NAME}"
"${GH}" repo set-default "NOAA-EMC/global-workflow"
"${GH}" pr create --title "${PULL_REQUEST_TITLE}" --body "${PULL_REQUEST_BODY}" --base "${BASE_BRANCH}" --head "${HEAD_BRANCH}"
"${GH}" pr ready --undo

Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/run_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ source "${HOMEgfs}/ush/detect_machine.sh"
case ${MACHINE_ID} in
hera | orion)
echo "Running Automated Testing on ${MACHINE_ID}"
source "${HOMEgfs}/ci/platforms/${MACHINE_ID}.sh"
source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}"
;;
*)
echo "Unsupported platform. Exiting with error."
Expand Down