From: Don Zickus <dzickus@xxxxxxxxxx>
CI: Move os-build tracking to common area
Future changes will use also use os-build, move the tracking to a common
area to reduce code duplication.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,12 +83,12 @@ ark_merge_request:
- git remote add gitlab git@xxxxxxxxxx:cki-project/kernel-ark.git
- gpg2 --import "$TORVALDS_GPG_KEY"
- git checkout --track origin/master && git describe
+ - git checkout --track origin/os-build && git describe
- export PROJECT_ID="$CI_PROJECT_ID"
merge_upstream:
extends: .scheduled_setup
script:
- - git checkout --track origin/os-build && git describe
- make dist-merge-upstream-push || exit 1
retry: 2
rules:
@@ -100,7 +100,6 @@ rawhide_release:
script:
- git checkout --track origin/ark-latest && git describe
- git checkout --track origin/ark-infra && git describe
- - git checkout --track origin/os-build && git describe
- redhat/scripts/ci/ark-create-release.sh "master" "$CI_PROJECT_ID" || exit_code=$?
- if [ $exit_code -eq 3 ]; then echo "Tag exists, halting" && exit 0; fi;
- if [ $exit_code -ne 0 ]; then echo "Unable to create release tag" && exit 1; fi;
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2517
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
