From a6c1c53df94dfc87ac5b8343ffa91a623f2ec53f Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 12 Jan 2023 16:05:46 +0000
Subject: [PATCH] Context component:
- corrected requirements
- updated CI/CD pipeline
---
common_requirements.in | 2 ++
src/context/.gitlab-ci.yml | 3 +--
src/context/requirements.in | 6 ------
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/common_requirements.in b/common_requirements.in
index 772c1115d..c255e6d9f 100644
--- a/common_requirements.in
+++ b/common_requirements.in
@@ -2,8 +2,10 @@ coverage==6.3
grpcio==1.47.*
grpcio-health-checking==1.47.*
grpcio-tools==1.47.*
+prettytable==3.5.0
prometheus-client==0.13.0
protobuf==3.20.*
pytest==6.2.5
pytest-benchmark==3.4.1
python-dateutil==2.8.2
+pytest-depends==1.0.1
diff --git a/src/context/.gitlab-ci.yml b/src/context/.gitlab-ci.yml
index ef780f7e3..9004d7dcd 100644
--- a/src/context/.gitlab-ci.yml
+++ b/src/context/.gitlab-ci.yml
@@ -51,7 +51,7 @@ unit test context:
- if docker network list | grep teraflowbridge; then echo "teraflowbridge is already created"; else docker network create -d bridge teraflowbridge; fi
- if docker container ls | grep crdb; then docker rm -f crdb; else echo "CockroachDB container is not in the system"; fi
- if docker volume ls | grep crdb; then docker volume rm -f crdb; else echo "CockroachDB volume is not in the system"; fi
- - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi
+ - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME container is not in the system"; fi
script:
- docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
- docker pull "cockroachdb/cockroach:latest-v22.2"
@@ -62,7 +62,6 @@ unit test context:
--env COCKROACH_USER=tfs
--env COCKROACH_PASSWORD=tfs123
--volume "crdb:/cockroach/cockroach-data"
- --volume "~/init-scripts:/docker-entrypoint-initdb.d"
cockroachdb/cockroach:latest-v22.2 start-single-node
- sleep 10
- CRDB_ADDRESS=$(docker inspect crdb --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")
diff --git a/src/context/requirements.in b/src/context/requirements.in
index f5d5ccbe2..83ae02faf 100644
--- a/src/context/requirements.in
+++ b/src/context/requirements.in
@@ -1,10 +1,4 @@
-Flask==2.1.3
-Flask-RESTful==0.3.9
psycopg2-binary==2.9.3
-pytest-depends==1.0.1
-redis==4.1.2
-requests==2.27.1
SQLAlchemy==1.4.40
sqlalchemy-cockroachdb==1.4.3
SQLAlchemy-Utils==0.38.3
-prettytable==3.5.0
--
GitLab