summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2018-06-12 17:11:09 +0200
committerVarac <varac@leap.se>2018-06-12 17:11:09 +0200
commit31a266c0ba60df121fba3a800cc6f623efe9d616 (patch)
tree796bde923a387ad2e97d31d5c3f09db1f6476fc5
parent4d2ef8694cbb3f7e29b48dc8e36e9ee7c0768ddc (diff)
Revert "CI update gitlab to test on stretch"
This reverts commit 4d2ef8694cbb3f7e29b48dc8e36e9ee7c0768ddc.
-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: