diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 06:08:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-23 06:08:47 +0000 |
| commit | d950ea420a77bc6b27037bd00484f2463e79b4fd (patch) | |
| tree | ec93e370d6543321bb725e06f331b602e06873ac /scripts/api | |
| parent | 9d9c8fc2ec2fdfa0bae2f77a5c2bde52a5bf45e2 (diff) | |
| download | gitlab-ce-d950ea420a77bc6b27037bd00484f2463e79b4fd.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/api')
| -rwxr-xr-x | scripts/api/cancel_pipeline.rb | 3 | ||||
| -rwxr-xr-x | scripts/api/download_job_artifact.rb | 3 | ||||
| -rwxr-xr-x | scripts/api/get_job_id.rb | 3 | ||||
| -rwxr-xr-x | scripts/api/play_job.rb | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/scripts/api/cancel_pipeline.rb b/scripts/api/cancel_pipeline.rb index 0965877a69a..f3aea90f54f 100755 --- a/scripts/api/cancel_pipeline.rb +++ b/scripts/api/cancel_pipeline.rb @@ -10,7 +10,8 @@ class CancelPipeline DEFAULT_OPTIONS = { project: ENV['CI_PROJECT_ID'], pipeline_id: ENV['CI_PIPELINE_ID'], - api_token: ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN'] + # Default to "CI scripts API usage" at https://gitlab.com/gitlab-org/gitlab/-/settings/access_tokens + api_token: ENV['PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE'] }.freeze def initialize(options) diff --git a/scripts/api/download_job_artifact.rb b/scripts/api/download_job_artifact.rb index 8e2207c6fa7..d725de3f1b6 100755 --- a/scripts/api/download_job_artifact.rb +++ b/scripts/api/download_job_artifact.rb @@ -11,7 +11,8 @@ require 'net/http' class ArtifactFinder DEFAULT_OPTIONS = { project: ENV['CI_PROJECT_ID'], - api_token: ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN'] + # Default to "CI scripts API usage" at https://gitlab.com/gitlab-org/gitlab/-/settings/access_tokens + api_token: ENV['PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE'] }.freeze def initialize(options) diff --git a/scripts/api/get_job_id.rb b/scripts/api/get_job_id.rb index dd0b7fbada0..f6f1f326225 100755 --- a/scripts/api/get_job_id.rb +++ b/scripts/api/get_job_id.rb @@ -11,7 +11,8 @@ class JobFinder pipeline_id: ENV['CI_PIPELINE_ID'], pipeline_query: {}, job_query: {}, - api_token: ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN'] + # Default to "CI scripts API usage" at https://gitlab.com/gitlab-org/gitlab/-/settings/access_tokens + api_token: ENV['PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE'] }.freeze def initialize(options) diff --git a/scripts/api/play_job.rb b/scripts/api/play_job.rb index 408dfdf1ef0..2c5cc75619d 100755 --- a/scripts/api/play_job.rb +++ b/scripts/api/play_job.rb @@ -10,7 +10,8 @@ class PlayJob DEFAULT_OPTIONS = { project: ENV['CI_PROJECT_ID'], pipeline_id: ENV['CI_PIPELINE_ID'], - api_token: ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN'] + # Default to "CI scripts API usage" at https://gitlab.com/gitlab-org/gitlab/-/settings/access_tokens + api_token: ENV['PROJECT_TOKEN_FOR_CI_SCRIPTS_API_USAGE'] }.freeze def initialize(options) |