attemt to use one stage

.gitlab-ci.yml

@@ -53,61 +53,42 @@ 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"
+
     - 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"
+
     - 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"
+
     - 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
+test:
+  stage: build
   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
+    - apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal gdal-dev g++
     - 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
-    
+    - pytest -s renderer_test.py
 
+    except:
+      - master
+  
 
-  after_script:
 
         
\ No newline at end of file