diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-10 11:41:37 +0100 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-10 11:41:37 +0100 |
commit | 548b607461d36903fce5f7a23becfa16b1ac838f (patch) | |
tree | 8fd405cf7a4c8432549b15f68fc88b11c74db76a /vendor/gitlab-ci-yml | |
parent | 81ad61113112c49704cfe24b8e47479976422e60 (diff) | |
download | gitlab-ce-548b607461d36903fce5f7a23becfa16b1ac838f.tar.gz |
Update templates with new CI variableszj-update-templates
Diffstat (limited to 'vendor/gitlab-ci-yml')
-rw-r--r-- | vendor/gitlab-ci-yml/Docker.gitlab-ci.yml | 4 | ||||
-rw-r--r-- | vendor/gitlab-ci-yml/Maven.gitlab-ci.yml | 8 | ||||
-rw-r--r-- | vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml | 12 | ||||
-rw-r--r-- | vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml | 16 | ||||
-rw-r--r-- | vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml | 18 |
5 files changed, 29 insertions, 29 deletions
diff --git a/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml b/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml index 8c590579934..40648bcd3de 100644 --- a/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml @@ -7,7 +7,7 @@ services: build: stage: build script: - - export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-') - - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY + - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | tr -c '[:alnum:]_.-' '-') + - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" diff --git a/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml b/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml index b75f0665bee..91b096654d1 100644 --- a/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml @@ -3,9 +3,9 @@ # For docker image tags see https://hub.docker.com/_/maven/ # # For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html -# +# # This template will build and test your projects as well as create the documentation. -# +# # * Caches downloaded dependencies and plugins between invocation. # * Does only verify merge requests but deploy built artifacts of the # master branch. @@ -24,12 +24,12 @@ variables: MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" # Cache downloaded dependencies and plugins between builds. -# To keep cache across branches add 'key: "$CI_BUILD_REF_NAME"' +# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"' cache: paths: - .m2/repository -# This will only validate and compile stuff and run e.g. maven-enforcer-plugin. +# This will only validate and compile stuff and run e.g. maven-enforcer-plugin. # Because some enforcer rules might check dependency convergence and class duplications # we use `test-compile` here instead of `validate`, so the correct classpath is picked up. .validate: &validate diff --git a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml index 6b6c405a507..d3bb388a1e7 100644 --- a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml @@ -38,11 +38,11 @@ review: <<: *deploy stage: review variables: - APP: $CI_BUILD_REF_NAME - APP_HOST: $CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN + APP: $CI_COMMIT_REF_NAME + APP_HOST: $CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN environment: - name: review/$CI_BUILD_REF_NAME - url: http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN + name: review/$CI_COMMIT_REF_SLUG + url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN on_stop: stop-review only: - branches @@ -56,10 +56,10 @@ stop-review: - oc delete all -l "app=$APP" when: manual variables: - APP: $CI_BUILD_REF_NAME + APP: $CI_COMMIT_REF_NAME GIT_STRATEGY: none environment: - name: review/$CI_BUILD_REF_NAME + name: review/$CI_COMMIT_REF_SLUG action: stop only: - branches diff --git a/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml index 574f9365f14..c644560647f 100644 --- a/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml @@ -24,12 +24,12 @@ build: production: stage: production variables: - CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN + CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN script: - command deploy environment: name: production - url: http://production.$KUBE_DOMAIN + url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN when: manual only: - master @@ -37,24 +37,24 @@ production: staging: stage: staging variables: - CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN + CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN script: - command deploy environment: name: staging - url: http://staging.$KUBE_DOMAIN + url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN only: - master review: stage: review variables: - CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN + CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN script: - command deploy environment: - name: review/$CI_BUILD_REF_NAME - url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN + name: review/$CI_COMMIT_REF_NAME + url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN on_stop: stop_review only: - branches @@ -68,7 +68,7 @@ stop_review: script: - command destroy environment: - name: review/$CI_BUILD_REF_NAME + name: review/$CI_COMMIT_REF_NAME action: stop when: manual only: diff --git a/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml index 4d6f4e00ebb..27c9107e0d7 100644 --- a/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml @@ -1,4 +1,4 @@ -# Explaination on the scripts: +# Explanation on the scripts: # https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md image: registry.gitlab.com/gitlab-examples/openshift-deploy @@ -24,12 +24,12 @@ build: production: stage: production variables: - CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN + CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME.$KUBE_DOMAIN script: - command deploy environment: name: production - url: http://production.$KUBE_DOMAIN + url: http://$CI_PROJECT_NAME.$KUBE_DOMAIN when: manual only: - master @@ -37,24 +37,24 @@ production: staging: stage: staging variables: - CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN + CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN script: - command deploy environment: name: staging - url: http://staging.$KUBE_DOMAIN + url: http://$CI_PROJECT_NAME-staging.$KUBE_DOMAIN only: - master review: stage: review variables: - CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN + CI_ENVIRONMENT_URL: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN script: - command deploy environment: - name: review/$CI_BUILD_REF_NAME - url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN + name: review/$CI_COMMIT_REF_NAME + url: http://$CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN on_stop: stop_review only: - branches @@ -68,7 +68,7 @@ stop_review: script: - command destroy environment: - name: review/$CI_BUILD_REF_NAME + name: review/$CI_COMMIT_REF_NAME action: stop when: manual only: |