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

One stage ci

See merge request !10

.gitlab-ci.yml

@@ -3,8 +3,6 @@ variables:
 
 stages:
   - build
-  - test
-  - publish
 
 
 build-master:
@@ -15,30 +13,34 @@ build-master:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - VERSION=`grep 'version="*"' core/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION core/
-    - docker push "$IMAGE":$VERSION
-    - docker push "$IMAGE":latest
-    - VERSION=`grep 'version="*"' preprocessor/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION preprocessor/
-    - docker push "$IMAGE":$VERSION
-    - docker push "$IMAGE":latest
-    - VERSION=`grep 'version="*"' client/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION client/
-    - docker push "$IMAGE":$VERSION
-    - docker push "$IMAGE":latest
-    - VERSION=`grep 'version="*"' cache/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
-    - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION cache/
-    - docker push "$IMAGE":$VERSION
-    - docker push "$IMAGE":latest
+    - VERSION_1=`grep 'version="*"' core/Dockerfile | cut -d '"' -f2`
+    - IMAGE_1="$CI_REGISTRY_IMAGE/pvs_core"
+    - docker pull "$IMAGE_1":latest || true
+    - docker build --cache-from "$IMAGE_1":latest -t "$IMAGE_1":latest -t "$IMAGE_1":$VERSION_1 core/
+    - VERSION_2=`grep 'version="*"' preprocessor/Dockerfile | cut -d '"' -f2`
+    - IMAGE_2="$CI_REGISTRY_IMAGE/pvs_preprocessor"
+    - docker pull "$IMAGE_2":latest || true
+    - docker build --cache-from "$IMAGE_2":latest -t "$IMAGE_2":latest -t "$IMAGE_2":$VERSION_2 preprocessor/
+    - VERSION_3=`grep 'version="*"' client/Dockerfile | cut -d '"' -f2`
+    - IMAGE_3="$CI_REGISTRY_IMAGE/pvs_client"
+    - docker pull "$IMAGE_3":latest || true
+    - docker build --cache-from "$IMAGE_3":latest -t "$IMAGE_3":latest -t "$IMAGE_3":$VERSION_3 client/
+    - VERSION_4=`grep 'version="*"' cache/Dockerfile | cut -d '"' -f2`
+    - IMAGE_4="$CI_REGISTRY_IMAGE/pvs_cache"
+    - docker pull "$IMAGE_4":latest || true
+    - docker build --cache-from "$IMAGE_4":latest -t "$IMAGE_4":latest -t "$IMAGE_4":$VERSION_4 cache/
+    - chmod +x gitlab_test.sh
+    - ./gitlab_test.sh
+    - docker push "$IMAGE_1":$VERSION_1
+    - docker push "$IMAGE_1":latest
+    - docker push "$IMAGE_2":$VERSION_2
+    - docker push "$IMAGE_2":latest
+    - docker push "$IMAGE_3":$VERSION_3
+    - 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:
     - master
 
@@ -53,61 +55,19 @@ build:
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
     - 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 push "$IMAGE:$CI_COMMIT_REF_SLUG"
-    - docker push "$IMAGE:$CI_COMMIT_REF_NAME"
+    - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
     - 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 push "$IMAGE:$CI_COMMIT_REF_SLUG"
-    - docker push "$IMAGE:$CI_COMMIT_REF_NAME"
+    - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
     - 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 push "$IMAGE:$CI_COMMIT_REF_SLUG"
-    - docker push "$IMAGE:$CI_COMMIT_REF_NAME"
+    - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
     - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
     - 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 push "$IMAGE:$CI_COMMIT_REF_SLUG"
-    - docker push "$IMAGE:$CI_COMMIT_REF_NAME"
-  except:
-    - 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
+    - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
+    - chmod +x gitlab_test.sh
+    - ./gitlab_test.sh
     
-
-
-  after_script:
-
-        
\ No newline at end of file

gitlab_test.sh

+#!/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