diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9d8405955..72b64b8433 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -619,8 +619,6 @@ danger: only: refs: - merge_requests - variables: - - $DANGER_GITLAB_API_TOKEN checkbashisms: <<: *precheck_job @@ -2012,7 +2010,7 @@ backports: GIT_DEPTH: 200 script: # CI job token is not sufficient for push operations - - git remote get-url origin | sed -e "s/gitlab-ci-token:$CI_JOB_TOKEN/oauth2:$BACKPORT_GITLAB_API_TOKEN/" | xargs git remote set-url --push origin + - git remote get-url origin | sed -e "s/gitlab-ci-token:$CI_JOB_TOKEN/oauth2:$BIND_TEAM_WRITE_TOKEN/" | xargs git remote set-url --push origin # force-pushing is disabled so we have to have merge request on top - MERGE_REQUEST_ID="$(git log -1 --format='%b' | sed --silent -e 's/^See merge request [^!]\+!//p')" - git clone --depth 1 https://gitlab.isc.org/isc-projects/bind9-qa.git diff --git a/dangerfile.py b/dangerfile.py index 8c0bc9f9e1..cb04aeb384 100644 --- a/dangerfile.py +++ b/dangerfile.py @@ -58,7 +58,7 @@ is_full_backport = is_backport and "Backport::Partial" not in mr_labels gl = gitlab.Gitlab( url=f"https://{os.environ['CI_SERVER_HOST']}", - private_token=os.environ["DANGER_GITLAB_API_TOKEN"], + private_token=os.environ["BIND_TEAM_API_TOKEN"], ) proj = gl.projects.get(os.environ["CI_PROJECT_ID"]) mr = proj.mergerequests.get(os.environ["CI_MERGE_REQUEST_IID"])