From: Don Zickus <dzickus@xxxxxxxxxx>
Fix the fixup of Fedora release
My previous attempt at this fix appeared to show testing worked. Upon
closer inspection, GITLAB_URL needs to be a highlevel domain and not
project specific otherwise you get a 403 return code.
Just rename the variable to not be GITLAB_URL and all is well again.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
diff --git a/redhat/scripts/ci/ark-ci-env.sh b/redhat/scripts/ci/ark-ci-env.sh
index blahblah..blahblah 100644
--- a/redhat/scripts/ci/ark-ci-env.sh
+++ b/redhat/scripts/ci/ark-ci-env.sh
@@ -9,7 +9,7 @@ die()
ci_pre_check()
{
if test -n "${TO_PUSH}"; then
- if test -z "${GITLAB_URL}" || test -z "$GITLAB_PUSHURL"; then
+ if test -z "${GITLAB_PROJECT_URL}" || test -z "$GITLAB_PROJECT_PUSHURL"; then
echo "To enable git-push, please run:"
echo "git remote add gitlab <url>"
echo "git remote set-url --push gitlab <pushurl>"
@@ -24,8 +24,8 @@ UPSTREAM_REF=${1:-"master"}
BRANCH=${2:-"os-build"}
PROJECT_ID=${PROJECT_ID:-"13604247"}
TO_PUSH=${DIST_PUSH:-""}
-GITLAB_URL="$(git remote get-url gitlab 2>/dev/null)"
-GITLAB_PUSHURL="$(git config --get remote.gitlab.pushurl 2>/dev/null)"
+GITLAB_PROJECT_URL="$(git remote get-url gitlab 2>/dev/null)"
+GITLAB_PROJECT_PUSHURL="$(git config --get remote.gitlab.pushurl 2>/dev/null)"
ci_pre_check
@@ -33,5 +33,5 @@ export UPSTREAM_REF
export BRANCH
export PROJECT_ID
export TO_PUSH
-export GITLAB_URL
-export GITLAB_PUSHURL
+export GITLAB_PROJECT_URL
+export GITLAB_PROJECT_PUSHURL
diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -81,7 +81,7 @@ else
fi
echo
-PUSH_STR="branch ${BRANCH} to ${GITLAB_URL}"
+PUSH_STR="branch ${BRANCH} to ${GITLAB_PROJECT_URL}"
PUSH_CMD="git push gitlab ${BRANCH}"
PUSH_CONFIG_STR="config update branches"
PUSH_CONFIG_CMD="for branch in \$(git branch | grep configs/\"\$(date +%F)\"); do
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2712
_______________________________________________
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
