EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit ab337b83 authored by Mussab Abdalla's avatar Mussab Abdalla
Browse files

Merge branch 'one-stage-ci' into 'master' 

One stage ci

See merge request !10
parents dc1732b7 ba9b294b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 34
− 74
View file @ ab337b83
...@@ -3,8 +3,6 @@ variables: ...@@ -3,8 +3,6 @@ variables:
stages: stages:
- build - build
- test
- publish
build-master: build-master:
...@@ -15,30 +13,34 @@ build-master: ...@@ -15,30 +13,34 @@ build-master:
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
- VERSION=`grep 'version="*"' core/Dockerfile | cut -d '"' -f2` - VERSION_1=`grep 'version="*"' core/Dockerfile | cut -d '"' -f2`
- IMAGE="$CI_REGISTRY_IMAGE/pvs_core" - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core"
- docker pull "$IMAGE":latest || true - docker pull "$IMAGE_1":latest || true
- docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION core/ - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":latest -t "$IMAGE_1":$VERSION_1 core/
- docker push "$IMAGE":$VERSION - VERSION_2=`grep 'version="*"' preprocessor/Dockerfile | cut -d '"' -f2`
- docker push "$IMAGE":latest - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor"
- VERSION=`grep 'version="*"' preprocessor/Dockerfile | cut -d '"' -f2` - docker pull "$IMAGE_2":latest || true
- IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor" - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":latest -t "$IMAGE_2":$VERSION_2 preprocessor/
- docker pull "$IMAGE":latest || true - VERSION_3=`grep 'version="*"' client/Dockerfile | cut -d '"' -f2`
- docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION preprocessor/ - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client"
- docker push "$IMAGE":$VERSION - docker pull "$IMAGE_3":latest || true
- docker push "$IMAGE":latest - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":latest -t "$IMAGE_3":$VERSION_3 client/
- VERSION=`grep 'version="*"' client/Dockerfile | cut -d '"' -f2` - VERSION_4=`grep 'version="*"' cache/Dockerfile | cut -d '"' -f2`
- IMAGE="$CI_REGISTRY_IMAGE/pvs_client" - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache"
- docker pull "$IMAGE":latest || true - docker pull "$IMAGE_4":latest || true
- docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION client/ - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":latest -t "$IMAGE_4":$VERSION_4 cache/
- docker push "$IMAGE":$VERSION - chmod +x gitlab_test.sh
- docker push "$IMAGE":latest - ./gitlab_test.sh
- VERSION=`grep 'version="*"' cache/Dockerfile | cut -d '"' -f2` - docker push "$IMAGE_1":$VERSION_1
- IMAGE="$CI_REGISTRY_IMAGE/pvs_cache" - docker push "$IMAGE_1":latest
- docker pull "$IMAGE":latest || true - docker push "$IMAGE_2":$VERSION_2
- docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION cache/ - docker push "$IMAGE_2":latest
- docker push "$IMAGE":$VERSION - docker push "$IMAGE_3":$VERSION_3
- docker push "$IMAGE":latest - docker push "$IMAGE_3":latest
- docker push "$IMAGE_4":$VERSION_4
- docker push "$IMAGE_4":latest
- chmod +x gitlab_test.sh
- ./gitlab_test.sh
only: only:
- master - master
...@@ -53,61 +55,19 @@ build: ...@@ -53,61 +55,19 @@ build:
- IMAGE="$CI_REGISTRY_IMAGE/pvs_core" - IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
- docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
- docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME core/ - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME core/
- docker push "$IMAGE:$CI_COMMIT_REF_SLUG" - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
- docker push "$IMAGE:$CI_COMMIT_REF_NAME"
- IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor" - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
- docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
- docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME preprocessor/ - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME preprocessor/
- docker push "$IMAGE:$CI_COMMIT_REF_SLUG" - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
- docker push "$IMAGE:$CI_COMMIT_REF_NAME"
- IMAGE="$CI_REGISTRY_IMAGE/pvs_client" - IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
- docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
- docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME client/ - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME client/
- docker push "$IMAGE:$CI_COMMIT_REF_SLUG" - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
- docker push "$IMAGE:$CI_COMMIT_REF_NAME"
- IMAGE="$CI_REGISTRY_IMAGE/pvs_cache" - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
- docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
- docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME cache/ - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME cache/
- docker push "$IMAGE:$CI_COMMIT_REF_SLUG" - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
- docker push "$IMAGE:$CI_COMMIT_REF_NAME" - chmod +x gitlab_test.sh
except: - ./gitlab_test.sh
- master
test:
image: docker:latest
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
- chmod +x env_setup.sh wait_for_container.sh
- ./env_setup.sh
- mkdir data
- IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
- docker pull "$IMAGE" || true
- docker tag "$IMAGE" "$IMAGE:latest"
- IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
- docker pull "$IMAGE" || true
- docker tag "$IMAGE" "$IMAGE:latest"
- IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
- docker pull "$IMAGE" || true
- docker tag "$IMAGE" "$IMAGE:latest"
- IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
- docker pull "$IMAGE" || true
- docker tag "$IMAGE" "$IMAGE:latest"
- docker swarm init
- docker network create -d overlay emg-extnet
- docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
script:
- apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal
- pip3 install -r requirements.txt
- ./wait_for_container.sh
- docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py storage create pvs_testing pvs_testing --type swift --storage-auth auth-cloud-ovh
- docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /core/registrar.py --objects-prefix "OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar"
- pytest -s registrar_test.py --name OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar
after_script:
\ No newline at end of file
gitlab_test.sh 0 → 100644
+ 13
− 0
View file @ ab337b83
#!/bin/sh
chmod +x env_setup.sh wait_for_container.sh
./env_setup.sh
mkdir data
docker swarm init
docker network create -d overlay emg-extnet
docker stack deploy -c docker-compose.emg.yml -c docker-compose.emg.dev.yml emg-pvs
apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal
pip3 install -r requirements.txt
./wait_for_container.sh
docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py storage create pvs_testing pvs_testing --type swift --storage-auth auth-cloud-ovh
docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /core/registrar.py --objects-prefix "OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar"
pytest -s registrar_test.py --name OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment