From c934c15c5ea1209cde3856110ff952c03047d2ff Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Mon, 7 Jun 2021 16:44:01 +0200
Subject: [PATCH] change image entrypoint and test error handling
---
build/ci/.deploy-k8s.yml | 4 +++-
test/integration/nucleusIntegration_test.go | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build/ci/.deploy-k8s.yml b/build/ci/.deploy-k8s.yml
index 8454470c7..ca2a8d395 100644
--- a/build/ci/.deploy-k8s.yml
+++ b/build/ci/.deploy-k8s.yml
@@ -75,7 +75,9 @@ deploy:nightly:develop:
- if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == "mainline"
destroy:k8s:
- image: bitnami/kubectl:latest
+ image:
+ name: bitnami/kubectl:latest
+ entrypoint: [""]
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
when: always
diff --git a/test/integration/nucleusIntegration_test.go b/test/integration/nucleusIntegration_test.go
index 4a5a29eeb..d1d3b91fb 100644
--- a/test/integration/nucleusIntegration_test.go
+++ b/test/integration/nucleusIntegration_test.go
@@ -250,7 +250,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
if (subErr != nil) != wantErr {
if !wantErr && subErr != nil {
if subErr.Error() != "rpc error: code = Canceled desc = context canceled" {
- t.Errorf("Subscribe() error = %v, wantErr %v", err, tt.wantErr)
+ t.Errorf("Subscribe() error = %v, wantErr %v", subErr, tt.wantErr)
}
}
}
--
GitLab