diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-06-05 17:31:37 +0200 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-06-07 12:31:25 +0200 |
| commit | 05f2b9d2b72139df56f67e88aeb7ceb6d8ec4e69 (patch) | |
| tree | 6fce3da1defff38fe799321e3adfa7bc56537295 /.gitlab-ci.cut | |
| parent | 1c418514c6f3ea57570023833ef66d2c9d3473f2 (diff) | |
[feature] run vpn directly if user is root
- Improve tests too: add entry in resolv.conf, not done without
resolvconf
Diffstat (limited to '.gitlab-ci.cut')
| -rw-r--r-- | .gitlab-ci.cut | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/.gitlab-ci.cut b/.gitlab-ci.cut new file mode 100644 index 0000000..1016516 --- /dev/null +++ b/.gitlab-ci.cut @@ -0,0 +1,60 @@ +linux_test: + image: 0xacab.org:4567/leap/soledad:latest + stage: test + script: + - tox --recreate -e py27-dev + tags: + - linux + +osx_test: + stage: test + allow_failure: true + script: + - tox --recreate -e py27-dev + tags: + - osx + +bitmask_latest_bundle: + image: 0xacab.org:4567/leap/bitmask-dev:latest + stage: bundle + script: + - pkg/build_bundle_with_venv.sh + - mv "dist/bitmask-`cat pkg/next-version`" . + artifacts: + paths: + - "bitmask-`cat pkg/next-version`" + name: "Bitmask_linux64_latest_${CI_BUILD_REF}" + expire_in: 1 month + tags: + - linux + +build_ui: + image: 0xacab.org:4567/leap/bitmask-dev:latest + stage: build + script: + - cd ui && make dev-build + tags: + - linux + +build_docker_image: + image: 0xacab.org:4567/leap/bitmask-dev:latest + stage: test + services: + - docker:dind + tags: + - docker-in-docker + only: + - branches@leap/bitmask-dev + before_script: + - > + export LAST_COMMIT=$(curl -s --header "PRIVATE-TOKEN: ${LEAP_CODE_O_MATIC_PRIVATE_TOKEN}" https://0xacab.org/api/v4/projects/574/pipelines | + python -c "import sys, json; print json.load(sys.stdin)[1]['sha']") + script: + - > + if git diff $LAST_COMMIT HEAD --name-only|grep tests/docker; then + docker --version + docker info + docker login -u gitlab-ci-token -e sysdev@leap.se -p $CI_JOB_TOKEN $CI_REGISTRY + docker build -t ${CI_REGISTRY_IMAGE}:latest tests/docker + docker push ${CI_REGISTRY_IMAGE}:latest + fi |