summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.cut60
-rw-r--r--.gitlab-ci.yml67
2 files changed, 63 insertions, 64 deletions
diff --git a/.gitlab-ci.cut b/.gitlab-ci.cut
deleted file mode 100644
index 10165164..00000000
--- a/.gitlab-ci.cut
+++ /dev/null
@@ -1,60 +0,0 @@
-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
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f61f5575..c05494fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,50 @@
stages:
+ - test
+ - bundle
+ - build_ui
- e2e
-# - test
-# - bundle
-# - build
-
variables:
DOCKER_DRIVER: overlay
+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_ui
+ script:
+ - cd ui && make dev-build
+ tags:
+ - linux
+
e2e_tests:
image: 0xacab.org:4567/leap/bitmask-dev:latest
stage: e2e
@@ -22,3 +59,25 @@ e2e_tests:
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