From d25dedb90065aefef518bb4bb541d3bb0e59fc46 Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Tue, 10 Aug 2021 10:12:07 +0200
Subject: [PATCH] Bug resolution related to integration tester
---
manifests/.gitlab-ci.yml | 7 -------
src/context/.gitlab-ci.yml | 1 -
src/device/.gitlab-ci.yml | 1 -
src/integration_tester/.gitlab-ci.yml | 9 ++++++---
src/integration_tester/Dockerfile | 1 +
5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/manifests/.gitlab-ci.yml b/manifests/.gitlab-ci.yml
index 0dc815226..0c0b1d4dc 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 0100c24a7..f0f1f7d6d 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 4c5abe58b..032868bd2 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 19bee8608..88e9c680b 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 9fd1623cf..5aabc8bc8 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", \
--
GitLab