From a81f447b0d2161b7b4412bfad5a38bcdf72ab454 Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Fri, 7 Jan 2022 09:59:46 +0100
Subject: [PATCH] Fixing Gitlab CI for Context and Compute components
---
manifests/computeservice.yaml | 10 ++++++++++
manifests/contextservice.yaml | 2 ++
src/context/tests/test_unitary.py | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/manifests/computeservice.yaml b/manifests/computeservice.yaml
index cdca52eb8..73380f75d 100644
--- a/manifests/computeservice.yaml
+++ b/manifests/computeservice.yaml
@@ -17,6 +17,7 @@ spec:
image: registry.gitlab.com/teraflow-h2020/controller/compute:latest
imagePullPolicy: Always
ports:
+ - containerPort: 8080
- containerPort: 9090
env:
- name: LOG_LEVEL
@@ -44,7 +45,12 @@ spec:
selector:
app: computeservice
ports:
+ - name: http
+ protocol: TCP
+ port: 8080
+ targetPort: 8080
- name: grpc
+ protocol: TCP
port: 9090
targetPort: 9090
---
@@ -59,6 +65,10 @@ spec:
selector:
app: computeservice
ports:
+ - name: http
+ protocol: TCP
+ port: 8080
+ targetPort: 8080
- name: grpc
protocol: TCP
port: 9090
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index c0ea046e0..6c72da1dd 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -64,9 +64,11 @@ spec:
app: contextservice
ports:
- name: grpc
+ protocol: TCP
port: 1010
targetPort: 1010
- name: http
+ protocol: TCP
port: 8080
targetPort: 8080
---
diff --git a/src/context/tests/test_unitary.py b/src/context/tests/test_unitary.py
index bf8857f70..5836511e1 100644
--- a/src/context/tests/test_unitary.py
+++ b/src/context/tests/test_unitary.py
@@ -322,7 +322,7 @@ def test_grpc_topology(
topology_event = None
for _ in range(2):
event = events_collector.get_event(block=True)
- assert isinstance(event, ContextEvent, TopologyEvent)
+ assert isinstance(event, (ContextEvent, TopologyEvent))
if isinstance(event, ContextEvent): context_event = event
if isinstance(event, TopologyEvent): topology_event = event
--
GitLab