fix(test): helm/bats + chore(blog): add 0.8.1 release note (#1033)

This commit is contained in:
Luigi Operoso
2024-07-08 08:56:23 +02:00
committed by GitHub
parent 3a5b7f6b4f
commit 24eac18564
6 changed files with 58 additions and 14 deletions
+5 -3
View File
@@ -34,6 +34,7 @@ diag() {
--set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.452.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
--set jenkins.seedJobs[0].id=seed-job \
@@ -154,9 +155,10 @@ diag() {
--set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.452.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
chart/jenkins-operator
chart/jenkins-operator --wait
assert_success
assert ${HELM} status default
}
@@ -199,10 +201,10 @@ diag() {
#bats test_tags=phase:helm,scenario:vanilla
@test "1.15 Helm: clean" {
run ${HELM} uninstall default
run ${HELM} uninstall default --wait
assert_success
# Wait for the complete removal
sleep 30
sleep 10
run verify "there is 0 pvc named 'jenkins backup'"
assert_success
+5 -3
View File
@@ -30,6 +30,7 @@ setup() {
--set jenkins.latestPlugins=true \
--set jenkins.nodeSelector.batstest=yep \
--set jenkins.image="jenkins/jenkins:2.452.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
jenkins-operator/jenkins-operator --version=$(get_latest_chart_version)
@@ -103,9 +104,10 @@ setup() {
--set jenkins.latestPlugins=true \
--set jenkins.nodeSelector.batstest=yep \
--set jenkins.image="jenkins/jenkins:2.452.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=false \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
chart/jenkins-operator
chart/jenkins-operator --wait
assert_success
assert ${HELM} status options
}
@@ -160,9 +162,9 @@ setup() {
@test "2.14 Helm: clean" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"
run ${HELM} uninstall options
run ${HELM} uninstall options --wait
assert_success
sleep 30
sleep 10
run verify "there is 0 pvc named 'jenkins backup'"
assert_success
+9 -3
View File
@@ -30,9 +30,12 @@ setup() {
--set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.452.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=true \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
--set webhook.enabled=true \
--set cert-manager.enabled=true \
--set cert-manager.startupapicheck.enabled=true \
jenkins-operator/jenkins-operator --version=$(get_latest_chart_version)
assert_success
assert ${HELM} status webhook
@@ -88,10 +91,13 @@ setup() {
--set operator.image=${OPERATOR_IMAGE} \
--set jenkins.latestPlugins=true \
--set jenkins.image="jenkins/jenkins:2.452.2-lts" \
--set jenkins.imagePullPolicy="IfNotPresent" \
--set jenkins.backup.makeBackupBeforePodDeletion=true \
--set jenkins.backup.image=quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test \
--set webhook.enabled=true \
chart/jenkins-operator
--set cert-manager.enabled=true \
--set cert-manager.startupapicheck.enabled=true \
chart/jenkins-operator --wait
assert_success
assert ${HELM} status webhook
sleep 10
@@ -137,9 +143,9 @@ setup() {
@test "3.12 Helm: clean" {
[[ ! -f "chart/jenkins-operator/deploy.tmp" ]] && skip "Jenkins helm chart have not been deployed correctly"
run ${HELM} uninstall webhook
run ${HELM} uninstall webhook --wait
assert_success
sleep 30
sleep 20
run verify "there is 0 pvc named 'jenkins backup'"
assert_success
+3 -1
View File
@@ -48,7 +48,9 @@ var _ = Describe("Jenkins Controller", func() {
cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug",
"--set-string", fmt.Sprintf("jenkins.namespace=%s", namespace.Name),
"--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.452.2-lts"),
"--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
"--set-string", fmt.Sprintf("operator.image=%s", *imageName),
"--set-string", fmt.Sprintf("backup.image=%s", "quay.io/jenkins-kubernetes-operator/backup-pvc:e2e-test"),
"--set-string", fmt.Sprintf("jenkins.imagePullPolicy=%s", "IfNotPresent"), "--install")
output, err := cmd.CombinedOutput()
Expect(err).NotTo(HaveOccurred(), string(output))