Merge branch 'add_gitlab_pages_predefined_variables' into 'master'
Add GitLab Pages predefined variables See merge request gitlab-org/gitlab-ce!24504
This commit is contained in:
commit
3a9c9e61c9
4 changed files with 23 additions and 0 deletions
|
@ -1689,11 +1689,19 @@ class Project < ActiveRecord::Base
|
||||||
.append(key: 'CI_PROJECT_NAMESPACE', value: namespace.full_path)
|
.append(key: 'CI_PROJECT_NAMESPACE', value: namespace.full_path)
|
||||||
.append(key: 'CI_PROJECT_URL', value: web_url)
|
.append(key: 'CI_PROJECT_URL', value: web_url)
|
||||||
.append(key: 'CI_PROJECT_VISIBILITY', value: visibility)
|
.append(key: 'CI_PROJECT_VISIBILITY', value: visibility)
|
||||||
|
.concat(pages_variables)
|
||||||
.concat(container_registry_variables)
|
.concat(container_registry_variables)
|
||||||
.concat(auto_devops_variables)
|
.concat(auto_devops_variables)
|
||||||
.concat(api_variables)
|
.concat(api_variables)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def pages_variables
|
||||||
|
Gitlab::Ci::Variables::Collection.new.tap do |variables|
|
||||||
|
variables.append(key: 'CI_PAGES_DOMAIN', value: Gitlab.config.pages.host)
|
||||||
|
variables.append(key: 'CI_PAGES_URL', value: pages_url)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def api_variables
|
def api_variables
|
||||||
Gitlab::Ci::Variables::Collection.new.tap do |variables|
|
Gitlab::Ci::Variables::Collection.new.tap do |variables|
|
||||||
variables.append(key: 'CI_API_V4_URL', value: API::Helpers::Version.new('v4').root_url)
|
variables.append(key: 'CI_API_V4_URL', value: API::Helpers::Version.new('v4').root_url)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Add GitLab Pages predefined CI variables 'CI_PAGES_DOMAIN' and 'CI_PAGES_URL'
|
||||||
|
merge_request: 24504
|
||||||
|
author: Adrian Moisey
|
||||||
|
type: added
|
|
@ -85,6 +85,8 @@ future GitLab releases.**
|
||||||
| **CI_NODE_INDEX** | 11.5 | all | Index of the job in the job set. If the job is not parallelized, this variable is not set. |
|
| **CI_NODE_INDEX** | 11.5 | all | Index of the job in the job set. If the job is not parallelized, this variable is not set. |
|
||||||
| **CI_NODE_TOTAL** | 11.5 | all | Total number of instances of this job running in parallel. If the job is not parallelized, this variable is set to `1`. |
|
| **CI_NODE_TOTAL** | 11.5 | all | Total number of instances of this job running in parallel. If the job is not parallelized, this variable is set to `1`. |
|
||||||
| **CI_API_V4_URL** | 11.7 | all | The GitLab API v4 root URL |
|
| **CI_API_V4_URL** | 11.7 | all | The GitLab API v4 root URL |
|
||||||
|
| **CI_PAGES_DOMAIN** | 11.8 | all | The configured domain that hosts GitLab Pages. |
|
||||||
|
| **CI_PAGES_URL** | 11.8 | all | URL to GitLab Pages-built pages. Always belongs to a subdomain of `CI_PAGES_DOMAIN`. |
|
||||||
| **CI_PIPELINE_ID** | 8.10 | all | The unique id of the current pipeline that GitLab CI uses internally |
|
| **CI_PIPELINE_ID** | 8.10 | all | The unique id of the current pipeline that GitLab CI uses internally |
|
||||||
| **CI_PIPELINE_IID** | 11.0 | all | The unique id of the current pipeline scoped to project |
|
| **CI_PIPELINE_IID** | 11.0 | all | The unique id of the current pipeline scoped to project |
|
||||||
| **CI_PIPELINE_SOURCE** | 10.0 | all | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, and `pipeline`. For pipelines created before GitLab 9.5, this will show as `unknown` |
|
| **CI_PIPELINE_SOURCE** | 10.0 | all | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, and `pipeline`. For pipelines created before GitLab 9.5, this will show as `unknown` |
|
||||||
|
@ -395,6 +397,10 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach
|
||||||
++ CI_SERVER_VERSION=8.14.3-ee
|
++ CI_SERVER_VERSION=8.14.3-ee
|
||||||
++ export CI_SERVER_REVISION=82823
|
++ export CI_SERVER_REVISION=82823
|
||||||
++ CI_SERVER_REVISION=82823
|
++ CI_SERVER_REVISION=82823
|
||||||
|
++ export CI_PAGES_DOMAIN=gitlab.io
|
||||||
|
++ CI_PAGES_DOMAIN=gitlab.io
|
||||||
|
++ export CI_PAGES_URL=https://gitlab-examples.gitlab.io/ci-debug-trace
|
||||||
|
++ CI_PAGES_URL=https://gitlab-examples.gitlab.io/ci-debug-trace
|
||||||
++ export CI_PROJECT_ID=17893
|
++ export CI_PROJECT_ID=17893
|
||||||
++ CI_PROJECT_ID=17893
|
++ CI_PROJECT_ID=17893
|
||||||
++ export CI_PROJECT_NAME=ci-debug-trace
|
++ export CI_PROJECT_NAME=ci-debug-trace
|
||||||
|
@ -498,6 +504,8 @@ export CI_JOB_TRIGGERED="true"
|
||||||
export CI_JOB_TOKEN="abcde-1234ABCD5678ef"
|
export CI_JOB_TOKEN="abcde-1234ABCD5678ef"
|
||||||
export CI_PIPELINE_ID="1000"
|
export CI_PIPELINE_ID="1000"
|
||||||
export CI_PIPELINE_IID="10"
|
export CI_PIPELINE_IID="10"
|
||||||
|
export CI_PAGES_DOMAIN="gitlab.io"
|
||||||
|
export CI_PAGES_URL="https://gitlab-org.gitlab.io/gitlab-ce"
|
||||||
export CI_PROJECT_ID="34"
|
export CI_PROJECT_ID="34"
|
||||||
export CI_PROJECT_DIR="/builds/gitlab-org/gitlab-ce"
|
export CI_PROJECT_DIR="/builds/gitlab-org/gitlab-ce"
|
||||||
export CI_PROJECT_NAME="gitlab-ce"
|
export CI_PROJECT_NAME="gitlab-ce"
|
||||||
|
|
|
@ -2133,6 +2133,8 @@ describe Ci::Build do
|
||||||
{ key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, public: true },
|
{ key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, public: true },
|
||||||
{ key: 'CI_PROJECT_URL', value: project.web_url, public: true },
|
{ key: 'CI_PROJECT_URL', value: project.web_url, public: true },
|
||||||
{ key: 'CI_PROJECT_VISIBILITY', value: 'private', public: true },
|
{ key: 'CI_PROJECT_VISIBILITY', value: 'private', public: true },
|
||||||
|
{ key: 'CI_PAGES_DOMAIN', value: Gitlab.config.pages.host, public: true },
|
||||||
|
{ key: 'CI_PAGES_URL', value: project.pages_url, public: true },
|
||||||
{ key: 'CI_API_V4_URL', value: 'http://localhost/api/v4', public: true },
|
{ key: 'CI_API_V4_URL', value: 'http://localhost/api/v4', public: true },
|
||||||
{ key: 'CI_PIPELINE_IID', value: pipeline.iid.to_s, public: true },
|
{ key: 'CI_PIPELINE_IID', value: pipeline.iid.to_s, public: true },
|
||||||
{ key: 'CI_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true },
|
{ key: 'CI_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true },
|
||||||
|
|
Loading…
Reference in a new issue