| commit | 7610585e2079cf14eeb68a3daea1af85e843c787 | [log] [tgz] |
|---|---|---|
| author | Arthur She <arthur.she@linaro.org> | Tue Jan 02 19:58:43 2024 -0800 |
| committer | Arthur She <arthur.she@linaro.org> | Tue Jan 02 20:07:29 2024 -0800 |
| tree | b44bed88f353ed9f11a5db415cc16aa56bf64469 | |
| parent | 5b160e50bc2ab73dad72486b7201d524493fc52b [diff] |
tf-sync-github-repos.yaml: run production script 1. The job should download the script from the production repo not the staging repo 2. The environment variable for the job trigger project branch should be "GERRIT_REFNAME" not "GERRIT_BRANCH" [1][2] [1]: https://ci.trustedfirmware.org/job/tf-sync-github-repos/396/console#:~:text=Komlev%40arm.com%3E-,GERRIT_REFNAME,-%3Dmain%0AGERRIT_EVENT_HASH%3D433740766 [2]: https://javadoc.jenkins.io/plugin/gerrit-trigger/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerParameters.html Signed-off-by: Arthur She <arthur.she@linaro.org> Change-Id: Ib5df3f4e0946ec4b0435264b4859916489751622
diff --git a/ci/tf-sync-repos.sh b/ci/tf-sync-repos.sh index 9bb134b..dca61b5 100755 --- a/ci/tf-sync-repos.sh +++ b/ci/tf-sync-repos.sh
@@ -79,7 +79,7 @@ gh_branch=$(echo ${branch} | awk -F: '{print $2}') # Only sync up the branch that triggered the job - [ "${gerrit_branch}" != "${GERRIT_BRANCH}" ] && continue + [ "${gerrit_branch}" != "${GERRIT_REFNAME}" ] && continue echo -e "\nFetching Gerrit ${GERRIT_PROJECT}:${gerrit_branch}\n" git -C "${_workdir}" fetch --tags "${gerrit_repo}" "${gerrit_branch}"
diff --git a/tf-sync-github-repos.yaml b/tf-sync-github-repos.yaml index 3230edd..a290e83 100644 --- a/tf-sync-github-repos.yaml +++ b/tf-sync-github-repos.yaml
@@ -13,7 +13,7 @@ env |grep '^GERRIT' echo "########################################################################" mkdir -p ci - wget -q https://git.trustedfirmware.org/next/ci/tf-ci-scripts.git/plain/ci/tf-sync-repos.sh -O ci/tf-sync-repos.sh + wget -q https://git.trustedfirmware.org/ci/tf-ci-scripts.git/plain/ci/tf-sync-repos.sh -O ci/tf-sync-repos.sh bash ci/tf-sync-repos.sh properties: - build-discarder: