From 719294cbfe522f1706292dccb5f269503502b37d Mon Sep 17 00:00:00 2001 From: James Lopez Date: Mon, 9 Jan 2017 15:24:25 +0100 Subject: [PATCH] update templates --- vendor/gitignore/Android.gitignore | 2 + vendor/gitignore/Autotools.gitignore | 15 +++ vendor/gitignore/CMake.gitignore | 1 + vendor/gitignore/Clojure.gitignore | 14 +-- vendor/gitignore/CodeIgniter.gitignore | 5 + vendor/gitignore/CommonLisp.gitignore | 14 +++ vendor/gitignore/Coq.gitignore | 29 +++++- vendor/gitignore/Dart.gitignore | 10 +- vendor/gitignore/Elisp.gitignore | 6 ++ vendor/gitignore/Elixir.gitignore | 1 + vendor/gitignore/Global/Emacs.gitignore | 5 +- .../Global/IPythonNotebook.gitignore | 2 - vendor/gitignore/Global/JetBrains.gitignore | 1 + vendor/gitignore/Global/SublimeText.gitignore | 3 + vendor/gitignore/Global/Vim.gitignore | 6 +- .../Global/VisualStudioCode.gitignore | 1 + vendor/gitignore/Global/Windows.gitignore | 3 +- vendor/gitignore/Go.gitignore | 2 +- vendor/gitignore/Java.gitignore | 3 + vendor/gitignore/Laravel.gitignore | 2 +- vendor/gitignore/Maven.gitignore | 3 + vendor/gitignore/Node.gitignore | 4 + vendor/gitignore/Perl.gitignore | 38 +++++--- vendor/gitignore/Python.gitignore | 1 + vendor/gitignore/Symfony.gitignore | 5 +- vendor/gitignore/TeX.gitignore | 22 ++++- vendor/gitignore/VisualStudio.gitignore | 5 +- vendor/gitlab-ci-yml/Docker.gitlab-ci.yml | 5 +- vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml | 6 +- vendor/gitlab-ci-yml/Go.gitlab-ci.yml | 37 ++++++++ vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml | 2 +- vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml | 92 +++++++++++++++++++ .../autodeploy/OpenShift.gitlab-ci.yml | 74 --------------- 33 files changed, 292 insertions(+), 127 deletions(-) mode change 100644 => 120000 vendor/gitignore/Clojure.gitignore delete mode 100644 vendor/gitignore/Global/IPythonNotebook.gitignore create mode 100644 vendor/gitlab-ci-yml/Go.gitlab-ci.yml create mode 100644 vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml delete mode 100644 vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore index 935ceef0680..d028d1251ad 100644 --- a/vendor/gitignore/Android.gitignore +++ b/vendor/gitignore/Android.gitignore @@ -35,6 +35,8 @@ captures/ # Intellij *.iml .idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml .idea/libraries # Keystore files diff --git a/vendor/gitignore/Autotools.gitignore b/vendor/gitignore/Autotools.gitignore index 1e9158e2a85..e3923f96fce 100644 --- a/vendor/gitignore/Autotools.gitignore +++ b/vendor/gitignore/Autotools.gitignore @@ -1,6 +1,11 @@ # http://www.gnu.org/software/automake Makefile.in +/ar-lib +/mdate-sh +/py-compile +/test-driver +/ylwrap # http://www.gnu.org/software/autoconf @@ -9,10 +14,20 @@ Makefile.in /autoscan-*.log /aclocal.m4 /compile +/config.guess /config.h.in +/config.sub /configure /configure.scan /depcomp /install-sh /missing /stamp-h1 + +# https://www.gnu.org/software/libtool/ + +/ltmain.sh + +# http://www.gnu.org/software/texinfo + +/texinfo.tex diff --git a/vendor/gitignore/CMake.gitignore b/vendor/gitignore/CMake.gitignore index 0cc7e4b5275..27ada0591ec 100644 --- a/vendor/gitignore/CMake.gitignore +++ b/vendor/gitignore/CMake.gitignore @@ -4,4 +4,5 @@ CMakeScripts Makefile cmake_install.cmake install_manifest.txt +compile_commands.json CTestTestfile.cmake diff --git a/vendor/gitignore/Clojure.gitignore b/vendor/gitignore/Clojure.gitignore deleted file mode 100644 index a9fe6fba80d..00000000000 --- a/vendor/gitignore/Clojure.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -pom.xml -pom.xml.asc -*.jar -*.class -/lib/ -/classes/ -/target/ -/checkouts/ -.lein-deps-sum -.lein-repl-history -.lein-plugins/ -.lein-failures -.nrepl-port diff --git a/vendor/gitignore/Clojure.gitignore b/vendor/gitignore/Clojure.gitignore new file mode 120000 index 00000000000..7657a270c45 --- /dev/null +++ b/vendor/gitignore/Clojure.gitignore @@ -0,0 +1 @@ +Leiningen.gitignore \ No newline at end of file diff --git a/vendor/gitignore/CodeIgniter.gitignore b/vendor/gitignore/CodeIgniter.gitignore index 0f77d9e1d17..60571a0c383 100644 --- a/vendor/gitignore/CodeIgniter.gitignore +++ b/vendor/gitignore/CodeIgniter.gitignore @@ -4,3 +4,8 @@ */cache/* !*/cache/index.html !*/cache/.htaccess + +user_guide_src/build/* +user_guide_src/cilexer/build/* +user_guide_src/cilexer/dist/* +user_guide_src/cilexer/pycilexer.egg-info/* diff --git a/vendor/gitignore/CommonLisp.gitignore b/vendor/gitignore/CommonLisp.gitignore index 4806e580b60..e7de127b014 100644 --- a/vendor/gitignore/CommonLisp.gitignore +++ b/vendor/gitignore/CommonLisp.gitignore @@ -1,3 +1,17 @@ *.FASL *.fasl *.lisp-temp +*.dfsl +*.pfsl +*.d64fsl +*.p64fsl +*.lx64fsl +*.lx32fsl +*.dx64fsl +*.dx32fsl +*.fx64fsl +*.fx32fsl +*.sx64fsl +*.sx32fsl +*.wx64fsl +*.wx32fsl diff --git a/vendor/gitignore/Coq.gitignore b/vendor/gitignore/Coq.gitignore index d3083b3a605..f25a61d9964 100644 --- a/vendor/gitignore/Coq.gitignore +++ b/vendor/gitignore/Coq.gitignore @@ -1,3 +1,30 @@ -*.vo +.*.aux +*.a +*.cma +*.cmi +*.cmo +*.cmx +*.cmxa +*.cmxs *.glob +*.ml.d +*.ml4.d +*.mli.d +*.mllib.d +*.mlpack.d +*.native +*.o *.v.d +*.vio +*.vo +.coq-native/ +.csdp.cache +.lia.cache +.nia.cache +.nlia.cache +.nra.cache +csdp.cache +lia.cache +nia.cache +nlia.cache +nra.cache diff --git a/vendor/gitignore/Dart.gitignore b/vendor/gitignore/Dart.gitignore index 7c280441649..4b366585ddc 100644 --- a/vendor/gitignore/Dart.gitignore +++ b/vendor/gitignore/Dart.gitignore @@ -1,13 +1,19 @@ # See https://www.dartlang.org/tools/private-files.html # Files and directories created by pub -.buildlog + +# SDK 1.20 and later (no longer creates packages directories) .packages -.project .pub/ build/ + +# Older SDK versions +# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20) +.project +.buildlog **/packages/ + # Files created by dart2js # (Most Dart developers will use pub build to compile Dart, use/modify these # rules if you intend to use dart2js directly diff --git a/vendor/gitignore/Elisp.gitignore b/vendor/gitignore/Elisp.gitignore index 9b4291b7fe8..206569dc661 100644 --- a/vendor/gitignore/Elisp.gitignore +++ b/vendor/gitignore/Elisp.gitignore @@ -3,3 +3,9 @@ # Packaging .cask + +# Backup files +*~ + +# Undo-tree save-files +*.~undo-tree diff --git a/vendor/gitignore/Elixir.gitignore b/vendor/gitignore/Elixir.gitignore index 755b605549d..ac67aaf3243 100644 --- a/vendor/gitignore/Elixir.gitignore +++ b/vendor/gitignore/Elixir.gitignore @@ -3,3 +3,4 @@ /deps erl_crash.dump *.ez +*.beam diff --git a/vendor/gitignore/Global/Emacs.gitignore b/vendor/gitignore/Global/Emacs.gitignore index 0c96c9ad060..3ac7904dcd2 100644 --- a/vendor/gitignore/Global/Emacs.gitignore +++ b/vendor/gitignore/Global/Emacs.gitignore @@ -39,4 +39,7 @@ flycheck_*.el /server/ # projectiles files -.projectile \ No newline at end of file +.projectile + +# directory configuration +.dir-locals.el diff --git a/vendor/gitignore/Global/IPythonNotebook.gitignore b/vendor/gitignore/Global/IPythonNotebook.gitignore deleted file mode 100644 index 27c13510bf5..00000000000 --- a/vendor/gitignore/Global/IPythonNotebook.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Temporary data -.ipynb_checkpoints/ diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore index 0a254147875..e375c744b6d 100644 --- a/vendor/gitignore/Global/JetBrains.gitignore +++ b/vendor/gitignore/Global/JetBrains.gitignore @@ -6,6 +6,7 @@ .idea/tasks.xml # Sensitive or high-churn files: +.idea/dataSources/ .idea/dataSources.ids .idea/dataSources.xml .idea/dataSources.local.xml diff --git a/vendor/gitignore/Global/SublimeText.gitignore b/vendor/gitignore/Global/SublimeText.gitignore index 69c8c2b29ce..95ff2244c99 100644 --- a/vendor/gitignore/Global/SublimeText.gitignore +++ b/vendor/gitignore/Global/SublimeText.gitignore @@ -20,6 +20,9 @@ Package Control.ca-bundle Package Control.system-ca-bundle Package Control.cache/ Package Control.ca-certs/ +Package Control.merged-ca-bundle +Package Control.user-ca-bundle +oscrypto-ca-bundle.crt bh_unicode_properties.cache # Sublime-github package stores a github token in this file diff --git a/vendor/gitignore/Global/Vim.gitignore b/vendor/gitignore/Global/Vim.gitignore index bdc04a0b529..42e7afc1005 100644 --- a/vendor/gitignore/Global/Vim.gitignore +++ b/vendor/gitignore/Global/Vim.gitignore @@ -1,6 +1,8 @@ # swap -[._]*.s[a-w][a-z] -[._]s[a-w][a-z] +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] # session Session.vim # temporary diff --git a/vendor/gitignore/Global/VisualStudioCode.gitignore b/vendor/gitignore/Global/VisualStudioCode.gitignore index d9960081c98..0511e2b51f0 100644 --- a/vendor/gitignore/Global/VisualStudioCode.gitignore +++ b/vendor/gitignore/Global/VisualStudioCode.gitignore @@ -2,3 +2,4 @@ !.vscode/settings.json !.vscode/tasks.json !.vscode/launch.json +!.vscode/extensions.json diff --git a/vendor/gitignore/Global/Windows.gitignore b/vendor/gitignore/Global/Windows.gitignore index a0d31452b0e..ba26afd9653 100644 --- a/vendor/gitignore/Global/Windows.gitignore +++ b/vendor/gitignore/Global/Windows.gitignore @@ -1,6 +1,7 @@ -# Windows image file caches +# Windows thumbnail cache files Thumbs.db ehthumbs.db +ehthumbs_vista.db # Folder config file Desktop.ini diff --git a/vendor/gitignore/Go.gitignore b/vendor/gitignore/Go.gitignore index 397a0ed4acb..5e1047c9d78 100644 --- a/vendor/gitignore/Go.gitignore +++ b/vendor/gitignore/Go.gitignore @@ -26,5 +26,5 @@ _testmain.go # Output of the go coverage tool, specifically when used with LiteIDE *.out -# external packages folder +# External packages folder vendor/ diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index 32858aad3c3..e44e0860405 100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore @@ -1,5 +1,8 @@ *.class +# BlueJ files +*.ctxt + # Mobile Tools for Java (J2ME) .mtj.tmp/ diff --git a/vendor/gitignore/Laravel.gitignore b/vendor/gitignore/Laravel.gitignore index e7c594fa3e2..a2d1564060b 100644 --- a/vendor/gitignore/Laravel.gitignore +++ b/vendor/gitignore/Laravel.gitignore @@ -6,8 +6,8 @@ bootstrap/compiled.php app/storage/ # Laravel 5 & Lumen specific -bootstrap/cache/ public/storage +storage/*.key .env.*.php .env.php .env diff --git a/vendor/gitignore/Maven.gitignore b/vendor/gitignore/Maven.gitignore index 1cdc9f7fd45..9af45b175ae 100644 --- a/vendor/gitignore/Maven.gitignore +++ b/vendor/gitignore/Maven.gitignore @@ -7,3 +7,6 @@ release.properties dependency-reduced-pom.xml buildNumber.properties .mvn/timing.properties + +# Exclude maven wrapper +!/.mvn/wrapper/maven-wrapper.jar diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore index bc7fc55724c..9a439fcd988 100644 --- a/vendor/gitignore/Node.gitignore +++ b/vendor/gitignore/Node.gitignore @@ -42,3 +42,7 @@ jspm_packages # Output of 'npm pack' *.tgz + +# Yarn Integrity file +.yarn-integrity + diff --git a/vendor/gitignore/Perl.gitignore b/vendor/gitignore/Perl.gitignore index ae2ad536abb..d41364ab18e 100644 --- a/vendor/gitignore/Perl.gitignore +++ b/vendor/gitignore/Perl.gitignore @@ -1,20 +1,34 @@ -/blib/ -/.build/ -_build/ -cover_db/ -inc/ -Build !Build/ -Build.bat .last_cover_stats -/Makefile -/Makefile.old -/MANIFEST.bak /META.yml /META.json /MYMETA.* -nytprof.out -/pm_to_blib *.o *.bs + +# Devel::Cover +cover_db/ + +# Devel::NYTProf +nytprof.out + +# Dizt::Zilla +/.build/ + +# Module::Build +_build/ +Build +Build.bat + +# Module::Install +inc/ + +# ExtUitls::MakeMaker +/blib/ /_eumm/ +/*.gz +/Makefile +/Makefile.old +/MANIFEST.bak +/pm_to_blib +/*.zip diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore index 6a2bf47ade9..9a05e2debe5 100644 --- a/vendor/gitignore/Python.gitignore +++ b/vendor/gitignore/Python.gitignore @@ -20,6 +20,7 @@ lib64/ parts/ sdist/ var/ +wheels/ *.egg-info/ .installed.cfg *.egg diff --git a/vendor/gitignore/Symfony.gitignore b/vendor/gitignore/Symfony.gitignore index 7d56f982f81..ed4d3c6c28d 100644 --- a/vendor/gitignore/Symfony.gitignore +++ b/vendor/gitignore/Symfony.gitignore @@ -31,9 +31,6 @@ /web/bundles/ /web/uploads/ -# Assets managed by Bower -/web/assets/vendor/ - # PHPUnit /app/phpunit.xml /phpunit.xml @@ -45,4 +42,4 @@ /composer.phar # Backup entities generated with doctrine:generate:entities command -*/Entity/*~ +**/Entity/*~ diff --git a/vendor/gitignore/TeX.gitignore b/vendor/gitignore/TeX.gitignore index 1afbaf197f4..69bfb1eec3e 100644 --- a/vendor/gitignore/TeX.gitignore +++ b/vendor/gitignore/TeX.gitignore @@ -52,12 +52,22 @@ acs-*.bib # beamer *.nav +*.pre *.snm *.vrb +# changes +*.soc + # cprotect *.cpt +# elsarticle (documentclass of Elsevier journals) +*.spl + +# endnotes +*.ent + # fixme *.lox @@ -123,9 +133,7 @@ acs-*.bib *.maf *.mlf *.mlt -*.mtc -*.mtc[0-9] -*.mtc[1-9][0-9] +*.mtc[0-9]* # minted _minted* @@ -140,6 +148,9 @@ _minted* # nomencl *.nlo +# pax +*.pax + # sagetex *.sagetex.sage *.sagetex.py @@ -202,5 +213,8 @@ TSWLatexianTemp* # KBibTeX *~[0-9]* -# auto folder when using emacs and auctex +# auto folder when using emacs and auctex /auto/* + +# expex forward references with \gathertags +*-tags.tex diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore index 09e407344ca..d9e876cfcdd 100644 --- a/vendor/gitignore/VisualStudio.gitignore +++ b/vendor/gitignore/VisualStudio.gitignore @@ -8,7 +8,6 @@ *.user *.userosscache *.sln.docstates -*.vcxproj.filters # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs @@ -43,11 +42,11 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX +# .NET Core project.lock.json project.fragment.lock.json artifacts/ -Properties/launchSettings.json +**/Properties/launchSettings.json *_i.c *_p.c diff --git a/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml b/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml index f3fa3949656..8c590579934 100644 --- a/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Docker.gitlab-ci.yml @@ -7,6 +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 - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" . - - docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" + - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . + - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" diff --git a/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml b/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml index 00f9541e89b..981a77497e2 100644 --- a/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml @@ -1,6 +1,4 @@ -# This template uses the non default language docker image -# The image already has Hex installed. You might want to consider to use `elixir:latest` -image: trenpixster/elixir:latest +image: elixir:latest # Pick zero or more services to be used on all builds. # Only needed when using a docker container to run your tests in. @@ -11,6 +9,8 @@ services: - postgres:latest before_script: + - mix local.rebar --force + - mix local.hex --force - mix deps.get mix: diff --git a/vendor/gitlab-ci-yml/Go.gitlab-ci.yml b/vendor/gitlab-ci-yml/Go.gitlab-ci.yml new file mode 100644 index 00000000000..e23b6e212f0 --- /dev/null +++ b/vendor/gitlab-ci-yml/Go.gitlab-ci.yml @@ -0,0 +1,37 @@ +image: golang:latest + +# The problem is that to be able to use go get, one needs to put +# the repository in the $GOPATH. So for example if your gitlab domain +# is mydomainperso.com, and that your repository is repos/projectname, and +# the default GOPATH being /go, then you'd need to have your +# repository in /go/src/mydomainperso.com/repos/projectname +# Thus, making a symbolic link corrects this. +before_script: + - ln -s /builds /go/src/mydomainperso.com + - cd /go/src/mydomainperso.com/repos/projectname + +stages: + - test + - build + +format: + stage: test + script: + # Add here all the dependencies, or use glide/govendor to get + # them automatically. + # - curl https://glide.sh/get | sh + - go get github.com/alecthomas/kingpin + - go tool vet -composites=false -shadow=true *.go + - go test -race $(go list ./... | grep -v /vendor/) + +compile: + stage: build + script: + # Add here all the dependencies, or use glide/govendor/... + # to get them automatically. + - go get github.com/alecthomas/kingpin + # Better put this in a Makefile + - go build -race -ldflags "-extldflags '-static'" -o mybinary + artifacts: + paths: + - mybinary diff --git a/vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml b/vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml index 263c4c19999..98d3039ad06 100644 --- a/vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml @@ -31,4 +31,4 @@ build: test: stage: test script: - - ./gradlew -g /cache./gradle check + - ./gradlew -g /cache/.gradle check diff --git a/vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml b/vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml new file mode 100644 index 00000000000..2ba5cad9682 --- /dev/null +++ b/vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml @@ -0,0 +1,92 @@ +# This file is a template, and might need editing before it works on your project. +image: ayufan/openshift-cli + +stages: + - test + - review + - staging + - production + +variables: + OPENSHIFT_SERVER: openshift.default.svc.cluster.local + # OPENSHIFT_DOMAIN: apps.example.com + # Configure this variable in Secure Variables: + # OPENSHIFT_TOKEN: my.openshift.token + +test1: + stage: test + before_script: [] + script: + - echo run tests + +test2: + stage: test + before_script: [] + script: + - echo run tests + +.deploy: &deploy + before_script: + - oc login "$OPENSHIFT_SERVER" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify + - oc project "$CI_PROJECT_NAME" 2> /dev/null || oc new-project "$CI_PROJECT_NAME" + script: + - "oc get services $APP 2> /dev/null || oc new-app . --name=$APP --strategy=docker" + - "oc start-build $APP --from-dir=. --follow || sleep 3s || oc start-build $APP --from-dir=. --follow" + - "oc get routes $APP 2> /dev/null || oc expose service $APP --hostname=$APP_HOST" + +review: + <<: *deploy + stage: review + variables: + APP: $CI_BUILD_REF_NAME + APP_HOST: $CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN + environment: + name: review/$CI_BUILD_REF_NAME + url: http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN + on_stop: stop-review + only: + - branches + except: + - master + +stop-review: + <<: *deploy + stage: review + script: + - oc delete all -l "app=$APP" + when: manual + variables: + APP: $CI_BUILD_REF_NAME + GIT_STRATEGY: none + environment: + name: review/$CI_BUILD_REF_NAME + action: stop + only: + - branches + except: + - master + +staging: + <<: *deploy + stage: staging + variables: + APP: staging + APP_HOST: $CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN + environment: + name: staging + url: http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN + only: + - master + +production: + <<: *deploy + stage: production + variables: + APP: production + APP_HOST: $CI_PROJECT_NAME.$OPENSHIFT_DOMAIN + when: manual + environment: + name: production + url: http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN + only: + - master diff --git a/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml deleted file mode 100644 index e384b585ae0..00000000000 --- a/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml +++ /dev/null @@ -1,74 +0,0 @@ -image: registry.gitlab.com/gitlab-examples/openshift-deploy - -variables: - # Application deployment domain - KUBE_DOMAIN: domain.example.com - -stages: - - build - - test - - review - - staging - - production - -build: - stage: build - script: - - command build - only: - - branches - -production: - stage: production - variables: - CI_ENVIRONMENT_URL: http://production.$KUBE_DOMAIN - script: - - command deploy - environment: - name: production - url: http://production.$KUBE_DOMAIN - when: manual - only: - - master - -staging: - stage: staging - variables: - CI_ENVIRONMENT_URL: http://staging.$KUBE_DOMAIN - script: - - command deploy - environment: - name: staging - url: http://staging.$KUBE_DOMAIN - only: - - master - -review: - stage: review - variables: - CI_ENVIRONMENT_URL: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN - script: - - command deploy - environment: - name: review/$CI_BUILD_REF_NAME - url: http://$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN - on_stop: stop_review - only: - - branches - except: - - master - -stop_review: - stage: review - variables: - GIT_STRATEGY: none - script: - - command destroy - environment: - name: review/$CI_BUILD_REF_NAME - action: stop - when: manual - only: - - branches - except: - - master