public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bats test, remove duplicate test, check for logs, wait for the new version

This commit is contained in:
brokenpip3 2025-04-03 22:38:50 +02:00
parent dc1ebc5aea
commit 731e903cb5
No known key found for this signature in database
GPG Key ID: 1D9BDC803797B4B6
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/bats/1-deploy.bats
View File

@ -68,8 +68,12 @@ diag() {
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'" 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'"
assert_success assert_success
run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"backup\")].ready' is 'true'"
assert_success assert_success
run ${KUBECTL} logs -l jenkins-cr=jenkins --tail=-1
assert_success
assert_output --partial 'Jenkins is fully up and running'
} }
#bats test_tags=phase:helm,scenario:vanilla #bats test_tags=phase:helm,scenario:vanilla
@ -161,6 +165,9 @@ diag() {
chart/jenkins-operator --wait chart/jenkins-operator --wait
assert_success assert_success
assert ${HELM} status default assert ${HELM} status default
# Additional sleep to wait for the upgrade to start deploy a new version
sleep 15
} }
#bats test_tags=phase:helm,scenario:vanilla #bats test_tags=phase:helm,scenario:vanilla
@ -177,30 +184,21 @@ diag() {
} }
#bats test_tags=phase:helm,scenario:vanilla #bats test_tags=phase:helm,scenario:vanilla
@test "1.13 Helm: check Jenkins operator pods status" { @test "1.13 Helm: check Jenkins Pod status" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"
run verify "there is 1 deployment named 'default-jenkins-operator'"
assert_success
run verify "there is 1 pod named 'default-jenkins-operator-'"
assert_success
run try "at most 20 times every 10s to get pods named 'default-jenkins-operator-' and verify that '.status.containerStatuses[?(@.name==\"jenkins-operator\")].ready' is 'true'"
assert_success
}
#bats test_tags=phase:helm,scenario:vanilla
@test "1.14 Helm: check Jenkins Pod status" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly" [[ ! -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'" 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'"
assert_success assert_success
run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"jenkins-master\")].ready' is 'true'" run try "at most 20 times every 5s to get pods named 'jenkins-jenkins' and verify that '.status.containerStatuses[?(@.name==\"backup\")].ready' is 'true'"
assert_success assert_success
run ${KUBECTL} logs -l jenkins-cr=jenkins --tail=-1
assert_success
assert_output --partial 'Jenkins is fully up and running'
} }
#bats test_tags=phase:helm,scenario:vanilla #bats test_tags=phase:helm,scenario:vanilla
@test "1.15 Helm: clean" { @test "1.14 Helm: clean" {
run ${HELM} uninstall default --wait run ${HELM} uninstall default --wait
assert_success assert_success
# Wait for the complete removal # Wait for the complete removal