diff options
| -rw-r--r-- | .gitlab-ci.yml | 33 | ||||
| -rw-r--r-- | tests/platform-ci/provider/common.json | 10 |
2 files changed, 26 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f515337f..21ea1f73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,9 @@ +--- image: 0xacab.org:4567/leap/docker/ruby:latest -# This is for caching the gems not only between the stages, but also persistent -# on the gitlab-runner so we don't need to install from scratch on every pipeline +# This is for caching the gems not only between the stages, but also +# persistent on the gitlab-runner so we don't need to install from +# scratch on every pipeline cache: key: "$CI_BUILD_REF_NAME" untracked: true @@ -46,7 +48,7 @@ catalog: script: - su -c '/usr/local/bin/bundle exec rake catalog' cirunner -#rspec: +# rspec: # stage: rspec # script: # - /usr/local/bin/bundle exec rake spec @@ -60,7 +62,18 @@ deploy_test: except: - master script: - - su -c '/usr/bin/unbuffer /bin/bash -o pipefail ./ci-build.sh | /usr/bin/ts' cirunner + - su -c 'set -o pipefail; stdbuf -oL -eL ./ci-build.sh | ts' cirunner + +# However, sometimes it's important to have a way of triggering a deploy +# from scratch manually even from the master branch, when i.e. new packages +# got uploaded to the master component of the platform deb repo. +deploy_test:manual: + stage: deploy + only: + - master + when: manual + script: + - su -c 'set -o pipefail; stdbuf -oL -eL ./ci-build.sh | ts' cirunner # Latest job will only run on the master branch, which means all merge requests # that are created from branches don't get to deploy to the latest-ci server. @@ -74,7 +87,9 @@ ci.leap.se: only: - master@leap/platform script: - - su -c '/usr/bin/unbuffer /bin/bash -o pipefail ./ci-build.sh | /usr/bin/ts' cirunner + - > + su -c '/usr/bin/unbuffer /bin/bash -o pipefail ./ci-build.sh | + /usr/bin/ts' cirunner demo.bitmask.net: stage: deploy @@ -84,7 +99,9 @@ demo.bitmask.net: - master when: manual script: - - su -c '/usr/bin/unbuffer /bin/bash -o pipefail ./ci-build.sh | /usr/bin/ts' cirunner + - > + su -c '/usr/bin/unbuffer /bin/bash -o pipefail ./ci-build.sh | + /usr/bin/ts' cirunner mail.bitmask.net: stage: deploy @@ -94,4 +111,6 @@ mail.bitmask.net: - master when: manual script: - - su -c '/usr/bin/unbuffer /bin/bash -o pipefail ./ci-build.sh | /usr/bin/ts' cirunner + - > + su -c '/usr/bin/unbuffer /bin/bash -o pipefail ./ci-build.sh | + /usr/bin/ts' cirunner diff --git a/tests/platform-ci/provider/common.json b/tests/platform-ci/provider/common.json deleted file mode 100644 index e5096c47..00000000 --- a/tests/platform-ci/provider/common.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "sources": { - "platform": { - "apt": { - "basic": "http://deb.leap.se/platform", - "component": "snapshots" - } - } - } -} |