diff --git a/manifests/.gitlab-ci.yml b/manifests/.gitlab-ci.yml index 0dc815226cbebebe3fbe81231df659e9c355841d..0c0b1d4dc0783e1bf3158d0629558b4fedd355d6 100644 --- a/manifests/.gitlab-ci.yml +++ b/manifests/.gitlab-ci.yml @@ -6,12 +6,5 @@ dependencies all: - kubectl version - kubectl get all - kubectl apply -f "manifests/prometheus.yaml" - - kubectl get all - -dependencies context_device: - stage: dependencies - script: - - kubectl version - - kubectl get all - kubectl apply -f "manifests/redis.yaml" - kubectl get all diff --git a/src/context/.gitlab-ci.yml b/src/context/.gitlab-ci.yml index 0100c24a7d7a194b8c973023bf14e3834a88967e..f0f1f7d6d0911b8a63710ca62baf45b882deb4c8 100644 --- a/src/context/.gitlab-ci.yml +++ b/src/context/.gitlab-ci.yml @@ -51,7 +51,6 @@ deploy context: - build context - test context - dependencies all - - dependencies context_device script: - kubectl version - kubectl get all diff --git a/src/device/.gitlab-ci.yml b/src/device/.gitlab-ci.yml index 4c5abe58bbed6fa3e1d550a36565d5c74f532229..032868bd2cff8b10d7945fa0731b039eacaf833e 100644 --- a/src/device/.gitlab-ci.yml +++ b/src/device/.gitlab-ci.yml @@ -51,7 +51,6 @@ deploy device: - build device - test device - dependencies all - - dependencies context_device script: - kubectl version - kubectl get all diff --git a/src/integration_tester/.gitlab-ci.yml b/src/integration_tester/.gitlab-ci.yml index 19bee8608bda499483b6c5dfff46bc0218e109a7..88e9c680b666e1f04aba0dc46d1fd6ec48520831 100644 --- a/src/integration_tester/.gitlab-ci.yml +++ b/src/integration_tester/.gitlab-ci.yml @@ -51,10 +51,13 @@ integration_test integration_tester: - deploy device - dependencies all - dependencies context_device + before_script: + - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - kubectl version - kubectl get all - - kubectl run $(echo $IMAGE_NAME | sed -r 's/[^a-zA-Z0-9\.\-]/-/g') --image "$IMAGE_NAME:$IMAGE_TAG" --restart=Never --rm -i --tty + # --rm to remove tester when it finishes + - kubectl run $(echo $IMAGE_NAME | sed -r 's/[^a-zA-Z0-9\.\-]/-/g') --image "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG" --restart=Never -i --tty - kubectl get all - when: manual - allow_failure: false + #when: manual + #allow_failure: false diff --git a/src/integration_tester/Dockerfile b/src/integration_tester/Dockerfile index 9fd1623cf1f97f0d0c09afa6be19717b72b0af06..5aabc8bc89115a45b40095aa325808eaf3c4cbaf 100644 --- a/src/integration_tester/Dockerfile +++ b/src/integration_tester/Dockerfile @@ -26,6 +26,7 @@ RUN python3 -m pip install -r integration_tester/requirements.in COPY common/. common COPY context/. context COPY device/. device +COPY integration_tester/. integration_tester # Run integration tester ENTRYPOINT ["pytest", "-v", "--log-level=DEBUG", \