summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml27
1 files changed, 2 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2160d0cd..a7a79d11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,38 +51,15 @@ catalog:
script:
- su -c '/usr/local/bin/bundle exec rake catalog' cirunner
-deploy_test:jessie:master:
+deploy_test:master:
stage: deploy
except:
- master
- - stretch
script:
- su -c 'set -o pipefail; stdbuf -oL -eL ./ci-build.sh | ts' cirunner
-deploy_test:jessie:staging:
+deploy_test:staging:
stage: deploy
- except:
- - stretch
- variables:
- COMPONENT: "staging"
- script:
- - su -c 'set -o pipefail; stdbuf -oL -eL ./ci-build.sh | ts' cirunner
-
-deploy_test:stretch:master:
- image: 0xacab.org:4567/leap/docker/ruby:stretch_amd64
- stage: deploy
- only:
- - stretch
- allow_failure: true
- script:
- - su -c 'set -o pipefail; stdbuf -oL -eL ./ci-build.sh | ts' cirunner
-
-deploy_test:stretch:staging:
- image: 0xacab.org:4567/leap/docker/ruby:stretch_amd64
- stage: deploy
- only:
- - stretch
- allow_failure: true
variables:
COMPONENT: "staging"
script: