From 5a1a4a1eec4ba1ed99743147558548228b40466d Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Tue, 12 Mar 2024 10:32:43 +0100 Subject: [PATCH] wip --- pkg/client/jenkins.go | 10 +++++----- test/bats/1-deploy.bats | 9 ++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkg/client/jenkins.go b/pkg/client/jenkins.go index ca929588..6111cd95 100644 --- a/pkg/client/jenkins.go +++ b/pkg/client/jenkins.go @@ -202,11 +202,11 @@ func (jenkins *jenkins) GetNodeSecret(name string) (string, error) { if err != nil { return "", errors.WithStack(err) } - defer func() { - if err := r.Body.Close(); err != nil { - errors.New("Failed to read response body") - } - }() + defer func() { + if err := r.Body.Close(); err != nil { + errors.Errorf("Failed to read response body: %s", err) + } + }() match := regex.FindStringSubmatch(content) if match == nil { diff --git a/test/bats/1-deploy.bats b/test/bats/1-deploy.bats index 2392293f..35347e8f 100644 --- a/test/bats/1-deploy.bats +++ b/test/bats/1-deploy.bats @@ -8,7 +8,14 @@ diag() { } #bats test_tags=phase:setup -@test "1.0 Create namespace" { +@test "1.0" { + run ! helm repo list | grep -q "jenkins" + [ "$status" -eq 0 ] && run helm repo add jenkins https://raw.githubusercontent.com/jenkinsci/kubernetes-operator/master/chart + assert_success +} + +#bats test_tags=phase:setup +@test "1.1 Create namespace" { ${KUBECTL} get ns ${DETIK_CLIENT_NAMESPACE} && skip "Namespace ${DETIK_CLIENT_NAMESPACE} already exists" run ${KUBECTL} create ns ${DETIK_CLIENT_NAMESPACE} assert_success