Skip to content

Commit

Permalink
paranoic spaces fix
Browse files Browse the repository at this point in the history
  • Loading branch information
brokenpip3 committed Mar 15, 2024
1 parent a760ddd commit 51ed21a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions test/bats/2-deploy-with-more-options.bats
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ setup() {
}

#bats test_tags=phase:helm,scenario:more-options
@test "2.2 Install helm chart with options" {
@test "2.2 Helm Install helm chart with options" {
#assert_success
run ${KUBECTL} label node jenkins-control-plane batstest=yep
run ${HELM} install options \
Expand Down Expand Up @@ -115,7 +115,7 @@ setup() {
}

#bats test_tags=phase:helm,scenario:more-options
@test "2.10 Helm: check Jenkins operator pods status again" {
@test "2.10 Helm: check Jenkins operator pods status again" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"

run verify "there is 1 deployment named 'options-jenkins-operator'"
Expand All @@ -129,7 +129,7 @@ setup() {
}

#bats test_tags=phase:helm,scenario:more-options
@test "2.11 Helm: check Jenkins Pod status again" {
@test "2.11 Helm: check Jenkins Pod status again" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"

run try "at most 20 times every 10s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'"
Expand All @@ -140,7 +140,7 @@ setup() {
}

#bats test_tags=phase:helm,scenario:more-options
@test "2.12 Helm: check node selector again" {
@test "2.12 Helm: check node selector again" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"

NODENAME=$(${KUBECTL} get pod jenkins-jenkins -o jsonpath={.spec.nodeName})
Expand All @@ -151,7 +151,7 @@ setup() {
}

#bats test_tags=phase:helm,scenario:more-options
@test "2.13 Helm: check jenkins-plugin-cli command again" {
@test "2.13 Helm: check jenkins-plugin-cli command again" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"

run ${KUBECTL} logs -c jenkins-master jenkins-jenkins
Expand All @@ -161,7 +161,7 @@ setup() {
}

#bats test_tags=phase:helm,scenario:more-options
@test "2.14 Helm: clean" {
@test "2.14 Helm: clean" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"

run ${HELM} uninstall options
Expand Down
4 changes: 2 additions & 2 deletions test/bats/3-deploy-with-webhook.bats
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ setup() {
}

#bats test_tags=phase:helm,scenario:webhook
@test "3.10 Helm: check Jenkins crd again" {
@test "3.10 Helm: check Jenkins crd again" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"
run verify "there is 1 crd named 'jenkins.jenkins.io'"
assert_success
}

#bats test_tags=phase:helm,scenario:webhook
@test "3.11 Helm: check cert-manager crd again" {
@test "3.11 Helm: check cert-manager crd again" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"
run verify "there is 1 crd named 'certificates.cert-manager.io'"
assert_success
Expand Down

0 comments on commit 51ed21a

Please sign in to comment.