diff options
| author | varac <varacanero@zeromail.org> | 2017-04-26 11:59:57 +0200 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-04-27 12:46:29 -0400 |
| commit | a577fbf20357ae1bc611da975cde001ef9dfa310 (patch) | |
| tree | 4b05f7115bd067c978663205e671d2f62cc6cd33 /.gitlab-ci.yml | |
| parent | 9d096ace3692f67fe82a97d648c930c2da19a830 (diff) | |
Improve ci-build.sh (Closes #8771)
* Change environment names for clarity:
. Use staging for deploying to latest
. Use production environments to deploy to demo:
production/vpn
production/mail
* Install leap_cli if not present and define default values
* Remove old nodes from cached runs
* Remove no longer used SEEDS variable
* Debugging improvements:
. Hide secrets when calling ci-build.sh with xtrace enabled
. Use unbuffer to we can add debug output locally
. Add debugging to build_from_scratch()
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cef28e0..7b0f8852 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,26 +60,36 @@ deploy_test: except: - master script: - - su -c '/usr/bin/unbuffer ./ci-build.sh' cirunner + - su -c '/usr/bin/unbuffer bash -o pipefail ./ci-build.sh | /usr/bin/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. # When a merge request is merged, then the latest job will deploy the code to # the latest provider, and the deployment will be recorded in an environment # named 'latest' -latest: +ci.leap.se: stage: deploy environment: name: staging only: - - master + - master + script: + - su -c '/usr/bin/unbuffer ./ci-build.sh' cirunner + +demo.bitmask.net: + stage: deploy + environment: + name: production/vpn + only: + - master + when: manual script: - su -c '/usr/bin/unbuffer ./ci-build.sh' cirunner -production: +mail.bitmask.net: stage: deploy environment: - name: production + name: production/mail only: - master when: manual |