kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Futher rename the CI variables

This commit is contained in:
Z.J. van de Weg 2017-03-10 11:20:08 +01:00
parent 68e64a5b44
commit 3ebd29b538
17 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -58,7 +58,7 @@ stages:
<<: *dedicated-runner <<: *dedicated-runner
<<: *use-db <<: *use-db
script: script:
- JOB_NAME=( $CI_BUILD_NAME ) - JOB_NAME=( $CI_JOB_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]} - export CI_NODE_TOTAL=${JOB_NAME[2]}
- export KNAPSACK_REPORT_PATH=knapsack/rspec_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json - export KNAPSACK_REPORT_PATH=knapsack/rspec_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
@ -78,7 +78,7 @@ stages:
<<: *dedicated-runner <<: *dedicated-runner
<<: *use-db <<: *use-db
script: script:
- JOB_NAME=( $CI_BUILD_NAME ) - JOB_NAME=( $CI_JOB_NAME )
- export CI_NODE_INDEX=${JOB_NAME[1]} - export CI_NODE_INDEX=${JOB_NAME[1]}
- export CI_NODE_TOTAL=${JOB_NAME[2]} - export CI_NODE_TOTAL=${JOB_NAME[2]}
- export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json - export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
@ -180,7 +180,7 @@ spinach 9 10: *spinach-knapsack
<<: *dedicated-runner <<: *dedicated-runner
stage: test stage: test
script: script:
- bundle exec $CI_BUILD_NAME - bundle exec $CI_JOB_NAME
rubocop: rubocop:
<<: *ruby-static-analysis <<: *ruby-static-analysis
@ -211,7 +211,7 @@ rake ee_compat_check:
- ee_compat_check/repo/ - ee_compat_check/repo/
- vendor/ruby - vendor/ruby
artifacts: artifacts:
name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}_${CI_BUILD_REF}" name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_REF}"
when: on_failure when: on_failure
expire_in: 10d expire_in: 10d
paths: paths:
@ -330,7 +330,7 @@ migration paths:
- sed -i 's/localhost/redis/g' config/resque.yml - sed -i 's/localhost/redis/g' config/resque.yml
- bundle install --without postgres production --jobs $(nproc) $FLAGS --retry=3 - bundle install --without postgres production --jobs $(nproc) $FLAGS --retry=3
- bundle exec rake db:drop db:create db:schema:load db:seed_fu - bundle exec rake db:drop db:create db:schema:load db:seed_fu
- git checkout $CI_BUILD_REF - git checkout $CI_COMMIT_REF
- source scripts/prepare_build.sh - source scripts/prepare_build.sh
- bundle exec rake db:migrate - bundle exec rake db:migrate
@ -402,7 +402,7 @@ notify:slack:
SETUP_DB: "false" SETUP_DB: "false"
USE_BUNDLE_INSTALL: "false" USE_BUNDLE_INSTALL: "false"
script: script:
- ./scripts/notify_slack.sh "#development" "Build on \`$CI_BUILD_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_BUILD_REF"/pipelines>" - ./scripts/notify_slack.sh "#development" "Build on \`$CI_COMMIT_REF_NAME\` failed! Commit \`$(git log -1 --oneline)\` See <https://gitlab.com/gitlab-org/$(basename "$PWD")/commit/"$CI_COMMIT_REF"/pipelines>"
when: on_failure when: on_failure
only: only:
- master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ce

2
config/initializers/rspec_profiling.rb
View File

@ -7,7 +7,7 @@ module RspecProfilingExt
module Git module Git
def branch def branch
ENV['CI_BUILD_REF_NAME'] || super ENV['CI_COMMIT_REF_NAME'] || super
end end
end end

14
doc/ci/docker/using_docker_build.md
View File

@ -298,14 +298,14 @@ could look like:
- docker:dind - docker:dind
stage: build stage: build
script: script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.example.com - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.example.com
- docker build -t registry.example.com/group/project:latest . - docker build -t registry.example.com/group/project:latest .
- docker push registry.example.com/group/project:latest - docker push registry.example.com/group/project:latest
``` ```
You have to use the special `gitlab-ci-token` user created for you in order to You have to use the special `gitlab-ci-token` user created for you in order to
push to the Registry connected to your project. Its password is provided in the push to the Registry connected to your project. Its password is provided in the
`$CI_BUILD_TOKEN` variable. This allows you to automate building and deployment `$CI_JOB_TOKEN` variable. This allows you to automate building and deployment
of your Docker images. of your Docker images.
You can also make use of [other variables](../variables/README.md) to avoid hardcoding: You can also make use of [other variables](../variables/README.md) to avoid hardcoding:
@ -315,10 +315,10 @@ services:
- docker:dind - docker:dind
variables: variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
before_script: before_script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_COMMIT_TOKEN $CI_REGISTRY
build: build:
stage: build stage: build
@ -328,7 +328,7 @@ build:
``` ```
Here, `$CI_REGISTRY_IMAGE` would be resolved to the address of the registry tied Here, `$CI_REGISTRY_IMAGE` would be resolved to the address of the registry tied
to this project, and `$CI_BUILD_REF_NAME` would be resolved to the branch or to this project, and `$CI_COMMIT_REF_NAME` would be resolved to the branch or
tag name for this particular job. We also declare our own variable, `$IMAGE_TAG`, tag name for this particular job. We also declare our own variable, `$IMAGE_TAG`,
combining the two to save us some typing in the `script` section. combining the two to save us some typing in the `script` section.
@ -350,11 +350,11 @@ stages:
- deploy - deploy
variables: variables:
CONTAINER_TEST_IMAGE: registry.example.com/my-group/my-project:$CI_BUILD_REF_NAME CONTAINER_TEST_IMAGE: registry.example.com/my-group/my-project:$CI_COMMIT_REF_NAME
CONTAINER_RELEASE_IMAGE: registry.example.com/my-group/my-project:latest CONTAINER_RELEASE_IMAGE: registry.example.com/my-group/my-project:latest
before_script: before_script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.example.com - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.example.com
build: build:
stage: build stage: build

36
doc/ci/environments.md
View File

@ -295,7 +295,7 @@ deploy_review:
script: script:
- echo "Deploy a review app" - echo "Deploy a review app"
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: https://$CI_ENVIRONMENT_SLUG.example.com url: https://$CI_ENVIRONMENT_SLUG.example.com
only: only:
- branches - branches
@ -306,22 +306,22 @@ deploy_review:
Let's break it down in pieces. The job's name is `deploy_review` and it runs Let's break it down in pieces. The job's name is `deploy_review` and it runs
on the `deploy` stage. The `script` at this point is fictional, you'd have to on the `deploy` stage. The `script` at this point is fictional, you'd have to
use your own based on your deployment. Then, we set the `environment` with the use your own based on your deployment. Then, we set the `environment` with the
`environment:name` being `review/$CI_BUILD_REF_NAME`. Now that's an interesting `environment:name` being `review/$CI_COMMIT_REF_NAME`. Now that's an interesting
one. Since the [environment name][env-name] can contain slashes (`/`), we can one. Since the [environment name][env-name] can contain slashes (`/`), we can
use this pattern to distinguish between dynamic environments and the regular use this pattern to distinguish between dynamic environments and the regular
ones. ones.
So, the first part is `review`, followed by a `/` and then `$CI_BUILD_REF_NAME` So, the first part is `review`, followed by a `/` and then `$CI_COMMIT_REF_NAME`
which takes the value of the branch name. Since `$CI_BUILD_REF_NAME` itself may which takes the value of the branch name. Since `$CI_COMMIT_REF_NAME` itself may
also contain `/`, or other characters that would be invalid in a domain name or also contain `/`, or other characters that would be invalid in a domain name or
URL, we use `$CI_ENVIRONMENT_SLUG` in the `environment:url` so that the URL, we use `$CI_ENVIRONMENT_SLUG` in the `environment:url` so that the
environment can get a specific and distinct URL for each branch. In this case, environment can get a specific and distinct URL for each branch. In this case,
given a `$CI_BUILD_REF_NAME` of `100-Do-The-Thing`, the URL will be something given a `$CI_COMMIT_REF_NAME` of `100-Do-The-Thing`, the URL will be something
like `https://100-do-the-4f99a2.example.com`. Again, the way you set up like `https://100-do-the-4f99a2.example.com`. Again, the way you set up
the web server to serve these requests is based on your setup. the web server to serve these requests is based on your setup.
You could also use `$CI_BUILD_REF_SLUG` in `environment:url`, e.g.: You could also use `$CI_COMMIT_REF_SLUG` in `environment:url`, e.g.:
`https://$CI_BUILD_REF_SLUG.example.com`. We use `$CI_ENVIRONMENT_SLUG` `https://$CI_COMMIT_REF_SLUG.example.com`. We use `$CI_ENVIRONMENT_SLUG`
here because it is guaranteed to be unique, but if you're using a workflow like here because it is guaranteed to be unique, but if you're using a workflow like
[GitLab Flow][gitlab-flow], collisions are very unlikely, and you may prefer [GitLab Flow][gitlab-flow], collisions are very unlikely, and you may prefer
environment names to be more closely based on the branch name - the example environment names to be more closely based on the branch name - the example
@ -356,7 +356,7 @@ deploy_review:
script: script:
- echo "Deploy a review app" - echo "Deploy a review app"
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: https://$CI_ENVIRONMENT_SLUG.example.com url: https://$CI_ENVIRONMENT_SLUG.example.com
only: only:
- branches - branches
@ -387,16 +387,16 @@ deploy_prod:
A more realistic example would include copying files to a location where a A more realistic example would include copying files to a location where a
webserver (NGINX) could then read and serve. The example below will copy the webserver (NGINX) could then read and serve. The example below will copy the
`public` directory to `/srv/nginx/$CI_BUILD_REF_SLUG/public`: `public` directory to `/srv/nginx/$CI_COMMIT_REF_SLUG/public`:
```yaml ```yaml
review_app: review_app:
stage: deploy stage: deploy
script: script:
- rsync -av --delete public /srv/nginx/$CI_BUILD_REF_SLUG - rsync -av --delete public /srv/nginx/$CI_COMMIT_REF_SLUG
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: https://$CI_BUILD_REF_SLUG.example.com url: https://$CI_COMMIT_REF_SLUG.example.com
``` ```
It is assumed that the user has already setup NGINX and GitLab Runner in the It is assumed that the user has already setup NGINX and GitLab Runner in the
@ -526,7 +526,7 @@ deploy_review:
script: script:
- echo "Deploy a review app" - echo "Deploy a review app"
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: https://$CI_ENVIRONMENT_SLUG.example.com url: https://$CI_ENVIRONMENT_SLUG.example.com
on_stop: stop_review on_stop: stop_review
only: only:
@ -542,7 +542,7 @@ stop_review:
- echo "Remove review app" - echo "Remove review app"
when: manual when: manual
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
action: stop action: stop
``` ```
@ -568,13 +568,13 @@ You can read more in the [`.gitlab-ci.yml` reference][onstop].
As we've seen in the [dynamic environments](#dynamic-environments), you can As we've seen in the [dynamic environments](#dynamic-environments), you can
prepend their name with a word, then followed by a `/` and finally the branch prepend their name with a word, then followed by a `/` and finally the branch
name which is automatically defined by the `CI_BUILD_REF_NAME` variable. name which is automatically defined by the `CI_COMMIT_REF_NAME` variable.
In short, environments that are named like `type/foo` are presented under a In short, environments that are named like `type/foo` are presented under a
group named `type`. group named `type`.
In our minimal example, we name the environments `review/$CI_BUILD_REF_NAME` In our minimal example, we name the environments `review/$CI_COMMIT_REF_NAME`
where `$CI_BUILD_REF_NAME` is the branch name: where `$CI_COMMIT_REF_NAME` is the branch name:
```yaml ```yaml
deploy_review: deploy_review:
@ -582,7 +582,7 @@ deploy_review:
script: script:
- echo "Deploy a review app" - echo "Deploy a review app"
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
``` ```
In that case, if you visit the Environments page, and provided the branches In that case, if you visit the Environments page, and provided the branches

2
doc/ci/review_apps/index.md
View File

@ -80,7 +80,7 @@ The process of adding Review Apps in your workflow would look like:
1. [Install][install-runner] and [configure][conf-runner] a Runner that does 1. [Install][install-runner] and [configure][conf-runner] a Runner that does
the deployment. the deployment.
1. Set up a job in `.gitlab-ci.yml` that uses the predefined 1. Set up a job in `.gitlab-ci.yml` that uses the predefined
[predefined CI environment variable][variables] `${CI_BUILD_REF_NAME}` to [predefined CI environment variable][variables] `${CI_COMMIT_REF_NAME}` to
create dynamic environments and restrict it to run only on branches. create dynamic environments and restrict it to run only on branches.
1. Optionally set a job that [manually stops][manual-env] the Review Apps. 1. Optionally set a job that [manually stops][manual-env] the Review Apps.

52
doc/ci/variables/README.md
View File

@ -236,18 +236,18 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach
++ CI=true ++ CI=true
++ export CI_DEBUG_TRACE=false ++ export CI_DEBUG_TRACE=false
++ CI_DEBUG_TRACE=false ++ CI_DEBUG_TRACE=false
++ export CI_BUILD_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ export CI_COMMIT_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ CI_BUILD_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ CI_COMMIT_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ export CI_BUILD_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ export CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ CI_BUILD_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ export CI_BUILD_REF_NAME=master ++ export CI_COMMIT_REF_NAME=master
++ CI_BUILD_REF_NAME=master ++ CI_COMMIT_REF_NAME=master
++ export CI_BUILD_ID=7046507 ++ export CI_JOB_ID=7046507
++ CI_BUILD_ID=7046507 ++ CI_JOB_ID=7046507
++ export CI_BUILD_REPO=https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git ++ export CI_REPOSITORY_URL=https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git
++ CI_BUILD_REPO=https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git ++ CI_REPOSITORY_URL=https://gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@example.com/gitlab-examples/ci-debug-trace.git
++ export CI_BUILD_TOKEN=xxxxxxxxxxxxxxxxxxxx ++ export CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
++ CI_BUILD_TOKEN=xxxxxxxxxxxxxxxxxxxx ++ CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
++ export CI_PROJECT_ID=1796893 ++ export CI_PROJECT_ID=1796893
++ CI_PROJECT_ID=1796893 ++ CI_PROJECT_ID=1796893
++ export CI_PROJECT_DIR=/builds/gitlab-examples/ci-debug-trace ++ export CI_PROJECT_DIR=/builds/gitlab-examples/ci-debug-trace
@ -266,20 +266,20 @@ Running on runner-8a2f473d-project-1796893-concurrent-0 via runner-8a2f473d-mach
++ CI=true ++ CI=true
++ export GITLAB_CI=true ++ export GITLAB_CI=true
++ GITLAB_CI=true ++ GITLAB_CI=true
++ export CI_BUILD_ID=7046507 ++ export CI_JOB_ID=7046507
++ CI_BUILD_ID=7046507 ++ CI_JOB_ID=7046507
++ export CI_BUILD_TOKEN=xxxxxxxxxxxxxxxxxxxx ++ export CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
++ CI_BUILD_TOKEN=xxxxxxxxxxxxxxxxxxxx ++ CI_JOB_TOKEN=xxxxxxxxxxxxxxxxxxxx
++ export CI_BUILD_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ export CI_COMMIT_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ CI_BUILD_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ CI_COMMIT_REF=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ export CI_BUILD_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ export CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ CI_BUILD_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045 ++ CI_COMMIT_BEFORE_SHA=dd648b2e48ce6518303b0bb580b2ee32fadaf045
++ export CI_BUILD_REF_NAME=master ++ export CI_COMMIT_REF_NAME=master
++ CI_BUILD_REF_NAME=master ++ CI_COMMIT_REF_NAME=master
++ export CI_BUILD_NAME=debug_trace ++ export CI_COMMIT_NAME=debug_trace
++ CI_BUILD_NAME=debug_trace ++ CI_JOB_NAME=debug_trace
++ export CI_BUILD_STAGE=test ++ export CI_JOB_STAGE=test
++ CI_BUILD_STAGE=test ++ CI_JOB_STAGE=test
++ export CI_SERVER_NAME=GitLab ++ export CI_SERVER_NAME=GitLab
++ CI_SERVER_NAME=GitLab ++ CI_SERVER_NAME=GitLab
++ export CI_SERVER_VERSION=8.14.3-ee ++ export CI_SERVER_VERSION=8.14.3-ee

26
doc/ci/yaml/README.md
View File

@ -153,7 +153,7 @@ thus allowing to fine tune them. Variables can be also defined on a
[job level](#job-variables). [job level](#job-variables).
Except for the user defined variables, there are also the ones set up by the Except for the user defined variables, there are also the ones set up by the
Runner itself. One example would be `CI_BUILD_REF_NAME` which has the value of Runner itself. One example would be `CI_COMMIT_REF_NAME` which has the value of
the branch or tag name for which project is built. Apart from the variables the branch or tag name for which project is built. Apart from the variables
you can set in `.gitlab-ci.yml`, there are also the so called secret variables you can set in `.gitlab-ci.yml`, there are also the so called secret variables
which can be set in GitLab's UI. which can be set in GitLab's UI.
@ -252,7 +252,7 @@ To enable per-job caching:
```yaml ```yaml
cache: cache:
key: "$CI_BUILD_NAME" key: "$CI_JOB_NAME"
untracked: true untracked: true
``` ```
@ -260,7 +260,7 @@ To enable per-branch caching:
```yaml ```yaml
cache: cache:
key: "$CI_BUILD_REF_NAME" key: "$CI_COMMIT_REF_NAME"
untracked: true untracked: true
``` ```
@ -268,7 +268,7 @@ To enable per-job and per-branch caching:
```yaml ```yaml
cache: cache:
key: "$CI_BUILD_NAME/$CI_BUILD_REF_NAME" key: "$CI_JOB_NAME/$CI_COMMIT_REF_NAME"
untracked: true untracked: true
``` ```
@ -276,7 +276,7 @@ To enable per-branch and per-stage caching:
```yaml ```yaml
cache: cache:
key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME" key: "$CI_JOB_STAGE/$CI_COMMIT_REF_NAME"
untracked: true untracked: true
``` ```
@ -285,7 +285,7 @@ If you use **Windows Batch** to run your shell scripts you need to replace
```yaml ```yaml
cache: cache:
key: "%CI_BUILD_STAGE%/%CI_BUILD_REF_NAME%" key: "%CI_JOB_STAGE%/%CI_COMMIT_REF_NAME%"
untracked: true untracked: true
``` ```
@ -739,12 +739,12 @@ deploy as review app:
stage: deploy stage: deploy
script: make deploy script: make deploy
environment: environment:
name: review/$CI_BUILD_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: https://$CI_ENVIRONMENT_SLUG.example.com/ url: https://$CI_ENVIRONMENT_SLUG.example.com/
``` ```
The `deploy as review app` job will be marked as deployment to dynamically The `deploy as review app` job will be marked as deployment to dynamically
create the `review/$CI_BUILD_REF_NAME` environment, where `$CI_BUILD_REF_NAME` create the `review/$CI_COMMIT_REF_NAME` environment, where `$CI_COMMIT_REF_NAME`
is an [environment variable][variables] set by the Runner. The is an [environment variable][variables] set by the Runner. The
`$CI_ENVIRONMENT_SLUG` variable is based on the environment name, but suitable `$CI_ENVIRONMENT_SLUG` variable is based on the environment name, but suitable
for inclusion in URLs. In this case, if the `deploy as review app` job was run for inclusion in URLs. In this case, if the `deploy as review app` job was run
@ -850,7 +850,7 @@ To create an archive with a name of the current job:
```yaml ```yaml
job: job:
artifacts: artifacts:
name: "$CI_BUILD_NAME" name: "$CI_JOB_NAME"
``` ```
To create an archive with a name of the current branch or tag including only To create an archive with a name of the current branch or tag including only
@ -859,7 +859,7 @@ the files that are untracked by Git:
```yaml ```yaml
job: job:
artifacts: artifacts:
name: "$CI_BUILD_REF_NAME" name: "$CI_COMMIT_REF_NAME"
untracked: true untracked: true
``` ```
@ -869,7 +869,7 @@ tag including only the files that are untracked by Git:
```yaml ```yaml
job: job:
artifacts: artifacts:
name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}" name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
untracked: true untracked: true
``` ```
@ -878,7 +878,7 @@ To create an archive with a name of the current [stage](#stages) and branch name
```yaml ```yaml
job: job:
artifacts: artifacts:
name: "${CI_BUILD_STAGE}_${CI_BUILD_REF_NAME}" name: "${CI_JOB_STAGE}_${CI_COMMIT_REF_NAME}"
untracked: true untracked: true
``` ```
@ -890,7 +890,7 @@ If you use **Windows Batch** to run your shell scripts you need to replace
```yaml ```yaml
job: job:
artifacts: artifacts:
name: "%CI_BUILD_STAGE%_%CI_BUILD_REF_NAME%" name: "%CI_JOB_STAGE%_%CI_COMMIT_REF_NAME%"
untracked: true untracked: true
``` ```

4
doc/user/project/new_ci_build_permissions_model.md
View File

@ -119,7 +119,7 @@ And then the users could also use it in their CI jobs all Docker related
commands to interact with GitLab Container Registry. For example: commands to interact with GitLab Container Registry. For example:
``` ```
docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.gitlab.com docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
``` ```
Using single token had multiple security implications: Using single token had multiple security implications:
@ -208,7 +208,7 @@ This is how an example usage can look like:
``` ```
test: test:
script: script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $CI_REGISTRY/group/other-project:latest - docker pull $CI_REGISTRY/group/other-project:latest
- docker run $CI_REGISTRY/group/other-project:latest - docker run $CI_REGISTRY/group/other-project:latest
``` ```

2
lib/tasks/gitlab/dev.rake
View File

@ -4,7 +4,7 @@ namespace :gitlab do
task :ee_compat_check, [:branch] => :environment do |_, args| task :ee_compat_check, [:branch] => :environment do |_, args|
opts = opts =
if ENV['CI'] if ENV['CI']
{ branch: ENV['CI_BUILD_REF_NAME'] } { branch: ENV['CI_COMMIT_REF_NAME'] }
else else
unless args[:branch] unless args[:branch]
puts "Must specify a branch as an argument".color(:red) puts "Must specify a branch as an argument".color(:red)

4
spec/lib/expand_variables_spec.rb
View File

@ -45,10 +45,10 @@ describe ExpandVariables do
{ key: 'variable', value: 'value' }, { key: 'variable', value: 'value' },
{ key: 'variable2', value: 'result' } { key: 'variable2', value: 'result' }
] }, ] },
{ value: 'review/$CI_BUILD_REF_NAME', { value: 'review/$CI_COMMIT_REF_NAME',
result: 'review/feature/add-review-apps', result: 'review/feature/add-review-apps',
variables: [ variables: [
{ key: 'CI_BUILD_REF_NAME', value: 'feature/add-review-apps' } { key: 'CI_COMMIT_REF_NAME', value: 'feature/add-review-apps' }
] }, ] },
] ]

4
spec/lib/gitlab/ci/config/entry/environment_spec.rb
View File

@ -151,8 +151,8 @@ describe Gitlab::Ci::Config::Entry::Environment do
context 'when variables are used for environment' do context 'when variables are used for environment' do
let(:config) do let(:config) do
{ name: 'review/$CI_BUILD_REF_NAME', { name: 'review/$CI_COMMIT_REF_NAME',
url: 'https://$CI_BUILD_REF_NAME.review.gitlab.com' } url: 'https://$CI_COMMIT_REF_NAME.review.gitlab.com' }
end end
describe '#valid?' do describe '#valid?' do

2
spec/models/environment_spec.rb
View File

@ -239,7 +239,7 @@ describe Environment, models: true do
describe '#actions_for' do describe '#actions_for' do
let(:deployment) { create(:deployment, environment: environment) } let(:deployment) { create(:deployment, environment: environment) }
let(:pipeline) { deployment.deployable.pipeline } let(:pipeline) { deployment.deployable.pipeline }
let!(:review_action) { create(:ci_build, :manual, name: 'review-apps', pipeline: pipeline, environment: 'review/$CI_BUILD_REF_NAME' )} let!(:review_action) { create(:ci_build, :manual, name: 'review-apps', pipeline: pipeline, environment: 'review/$CI_COMMIT_REF_NAME' )}
let!(:production_action) { create(:ci_build, :manual, name: 'production', pipeline: pipeline, environment: 'production' )} let!(:production_action) { create(:ci_build, :manual, name: 'production', pipeline: pipeline, environment: 'production' )}
it 'returns a list of actions with matching environment' do it 'returns a list of actions with matching environment' do

10
spec/requests/api/runner_spec.rb
View File

@ -312,8 +312,8 @@ describe API::Runner do
end end
let(:expected_variables) do let(:expected_variables) do
[{ 'key' => 'CI_BUILD_NAME', 'value' => 'spinach', 'public' => true }, [{ 'key' => 'CI_JOB_NAME', 'value' => 'spinach', 'public' => true },
{ 'key' => 'CI_BUILD_STAGE', 'value' => 'test', 'public' => true }, { 'key' => 'CI_JOB_STAGE', 'value' => 'test', 'public' => true },
{ 'key' => 'DB_NAME', 'value' => 'postgres', 'public' => true }] { 'key' => 'DB_NAME', 'value' => 'postgres', 'public' => true }]
end end
@ -437,9 +437,9 @@ describe API::Runner do
context 'when triggered job is available' do context 'when triggered job is available' do
let(:expected_variables) do let(:expected_variables) do
[{ 'key' => 'CI_BUILD_NAME', 'value' => 'spinach', 'public' => true }, [{ 'key' => 'CI_JOB_NAME', 'value' => 'spinach', 'public' => true },
{ 'key' => 'CI_BUILD_STAGE', 'value' => 'test', 'public' => true }, { 'key' => 'CI_JOB_STAGE', 'value' => 'test', 'public' => true },
{ 'key' => 'CI_BUILD_TRIGGERED', 'value' => 'true', 'public' => true }, { 'key' => 'CI_PIPELINE_TRIGGERED', 'value' => 'true', 'public' => true },
{ 'key' => 'DB_NAME', 'value' => 'postgres', 'public' => true }, { 'key' => 'DB_NAME', 'value' => 'postgres', 'public' => true },
{ 'key' => 'SECRET_KEY', 'value' => 'secret_value', 'public' => false }, { 'key' => 'SECRET_KEY', 'value' => 'secret_value', 'public' => false },
{ 'key' => 'TRIGGER_KEY_1', 'value' => 'TRIGGER_VALUE_1', 'public' => false }] { 'key' => 'TRIGGER_KEY_1', 'value' => 'TRIGGER_VALUE_1', 'public' => false }]

10
spec/requests/ci/api/builds_spec.rb
View File

@ -81,8 +81,8 @@ describe Ci::API::Builds do
expect(runner.reload.platform).to eq("darwin") expect(runner.reload.platform).to eq("darwin")
expect(json_response["options"]).to eq({ "image" => "ruby:2.1", "services" => ["postgres"] }) expect(json_response["options"]).to eq({ "image" => "ruby:2.1", "services" => ["postgres"] })
expect(json_response["variables"]).to include( expect(json_response["variables"]).to include(
{ "key" => "CI_BUILD_NAME", "value" => "spinach", "public" => true }, { "key" => "CI_JOB_NAME", "value" => "spinach", "public" => true },
{ "key" => "CI_BUILD_STAGE", "value" => "test", "public" => true }, { "key" => "CI_JOB_STAGE", "value" => "test", "public" => true },
{ "key" => "DB_NAME", "value" => "postgres", "public" => true } { "key" => "DB_NAME", "value" => "postgres", "public" => true }
) )
end end
@ -182,9 +182,9 @@ describe Ci::API::Builds do
expect(response).to have_http_status(201) expect(response).to have_http_status(201)
expect(json_response["variables"]).to include( expect(json_response["variables"]).to include(
{ "key" => "CI_BUILD_NAME", "value" => "spinach", "public" => true }, { "key" => "CI_JOB_NAME", "value" => "spinach", "public" => true },
{ "key" => "CI_BUILD_STAGE", "value" => "test", "public" => true }, { "key" => "CI_JOB_STAGE", "value" => "test", "public" => true },
{ "key" => "CI_BUILD_TRIGGERED", "value" => "true", "public" => true }, { "key" => "CI_PIPELINE_TRIGGERED", "value" => "true", "public" => true },
{ "key" => "DB_NAME", "value" => "postgres", "public" => true }, { "key" => "DB_NAME", "value" => "postgres", "public" => true },
{ "key" => "SECRET_KEY", "value" => "secret_value", "public" => false }, { "key" => "SECRET_KEY", "value" => "secret_value", "public" => false },
{ "key" => "TRIGGER_KEY_1", "value" => "TRIGGER_VALUE_1", "public" => false }, { "key" => "TRIGGER_KEY_1", "value" => "TRIGGER_VALUE_1", "public" => false },

2
spec/services/ci/create_pipeline_service_spec.rb
View File

@ -200,7 +200,7 @@ describe Ci::CreatePipelineService, services: true do
context 'with environment' do context 'with environment' do
before do before do
config = YAML.dump(deploy: { environment: { name: "review/$CI_BUILD_REF_NAME" }, script: 'ls' }) config = YAML.dump(deploy: { environment: { name: "review/$CI_COMMIT_REF_NAME" }, script: 'ls' })
stub_ci_pipeline_yaml_file(config) stub_ci_pipeline_yaml_file(config)
end end

8
spec/services/create_deployment_service_spec.rb
View File

@ -104,16 +104,16 @@ describe CreateDeploymentService, services: true do
context 'when variables are used' do context 'when variables are used' do
let(:params) do let(:params) do
{ {
environment: 'review-apps/$CI_BUILD_REF_NAME', environment: 'review-apps/$CI_COMMIT_REF_NAME',
ref: 'master', ref: 'master',
tag: false, tag: false,
sha: '97de212e80737a608d939f648d959671fb0a0142', sha: '97de212e80737a608d939f648d959671fb0a0142',
options: { options: {
name: 'review-apps/$CI_BUILD_REF_NAME', name: 'review-apps/$CI_COMMIT_REF_NAME',
url: 'http://$CI_BUILD_REF_NAME.review-apps.gitlab.com' url: 'http://$CI_COMMIT_REF_NAME.review-apps.gitlab.com'
}, },
variables: [ variables: [
{ key: 'CI_BUILD_REF_NAME', value: 'feature-review-apps' } { key: 'CI_COMMIT_REF_NAME', value: 'feature-review-apps' }
] ]
} }
end end

6
spec/simplecov_env.rb
View File

@ -15,9 +15,9 @@ module SimpleCovEnv
def configure_job def configure_job
SimpleCov.configure do SimpleCov.configure do
if ENV['CI_BUILD_NAME'] if ENV['CI_JOB_NAME']
coverage_dir "coverage/#{ENV['CI_BUILD_NAME']}" coverage_dir "coverage/#{ENV['CI_JOB_NAME']}"
command_name ENV['CI_BUILD_NAME'] command_name ENV['CI_JOB_NAME']
end end
if ENV['CI'] if ENV['CI']