From 3fe842fff4bb910278a905af8f9171e77a9cd313 Mon Sep 17 00:00:00 2001 From: Luigi Operoso <40476330+brokenpip3@users.noreply.github.com> Date: Tue, 6 Jun 2023 00:10:36 +0200 Subject: [PATCH] chore: prearing version bumpt to v0.8.0-beta2 (#849) --- .github/workflows/release-backup.yaml | 1 + VERSION.txt | 2 +- chart/jenkins-operator/values.yaml | 12 ++++++------ config.base.env | 2 +- pkg/plugins/base_plugins.go | 6 +++--- test/e2e/configuration_test.go | 6 +++--- test/e2e/test_utility.go | 2 +- test/helm/helm_test.go | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-backup.yaml b/.github/workflows/release-backup.yaml index 8a9ac30e4..983efc705 100644 --- a/.github/workflows/release-backup.yaml +++ b/.github/workflows/release-backup.yaml @@ -54,5 +54,6 @@ jobs: if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' run: | git reset --hard + rm bin/sembump make -C backup/pvc docker-build make -C backup/pvc docker-release diff --git a/VERSION.txt b/VERSION.txt index bd0a7375b..ff2a3fbfe 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v0.8.0-beta +v0.8.0-beta2 diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml index 7df657a08..d6415d75c 100644 --- a/chart/jenkins-operator/values.yaml +++ b/chart/jenkins-operator/values.yaml @@ -36,7 +36,7 @@ jenkins: # image is the name (and tag) of the Jenkins instance # Default: jenkins/jenkins:lts # It's recommended to use LTS (tag: "lts") version - image: jenkins/jenkins:2.387.3-lts + image: jenkins/jenkins:2.401.1-lts # env contains jenkins container environment variables env: [] @@ -92,15 +92,15 @@ jenkins: # - name: kubernetes # version: 3937.vd7b_82db_e347b_ # - name: workflow-job - # version: 1301.v054d9cea_9593 + # version: 1308.v58d48a_763b_31 # - name: workflow-aggregator # version: 596.v8c21c963d92d # - name: git # version: 5.0.2 # - name: job-dsl - # version: "1.83" + # version: "1.84" # - name: configuration-as-code - # version: 1625.v27444588cc3d + # version: 1647.ve39ca_b_829b_42 # - name: kubernetes-credentials-provider # version: 1.211.vc236a_f5a_2f3c @@ -210,7 +210,7 @@ jenkins: # image used by backup feature # By default using prebuilt backup PVC image - image: quay.io/jenkins-kubernetes-operator/backup-pvc:v0.2.1 + image: quay.io/jenkins-kubernetes-operator/backup-pvc:v0.2.5 # containerName is backup container name containerName: backup @@ -294,7 +294,7 @@ operator: replicaCount: 1 # image is the name (and tag) of the Jenkins Operator image - image: quay.io/jenkins-kubernetes-operator/operator:v0.8.0-beta + image: quay.io/jenkins-kubernetes-operator/operator:v0.8.0-beta2 # imagePullPolicy defines policy for pulling images imagePullPolicy: IfNotPresent diff --git a/config.base.env b/config.base.env index 2a74da58c..9c4ef8a3f 100644 --- a/config.base.env +++ b/config.base.env @@ -13,5 +13,5 @@ GEN_CRD_API=gen-crd-api-reference-docs IMAGE_PULL_MODE=local HELM_VERSION=3.1.2 CLUSTER_DOMAIN=cluster.local -LATEST_LTS_VERSION=2.387.3 +LATEST_LTS_VERSION=2.401.1 KIND_CLUSTER_NAME=jenkins diff --git a/pkg/plugins/base_plugins.go b/pkg/plugins/base_plugins.go index 39ca32641..c52471632 100644 --- a/pkg/plugins/base_plugins.go +++ b/pkg/plugins/base_plugins.go @@ -1,13 +1,13 @@ package plugins const ( - configurationAsCodePlugin = "configuration-as-code:1625.v27444588cc3d" + configurationAsCodePlugin = "configuration-as-code:1647.ve39ca_b_829b_42" gitPlugin = "git:5.0.2" - jobDslPlugin = "job-dsl:1.83" + jobDslPlugin = "job-dsl:1.84" kubernetesPlugin = "kubernetes:3937.vd7b_82db_e347b_" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c" workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d" - workflowJobPlugin = "workflow-job:1301.v054d9cea_9593" + workflowJobPlugin = "workflow-job:1308.v58d48a_763b_31" ) // basePluginsList contains plugins to install by operator. diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index ff8c86625..51f1904a4 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -24,13 +24,13 @@ import ( const e2e = "e2e" var expectedBasePluginsList = []plugins.Plugin{ - plugins.Must(plugins.New("configuration-as-code:1625.v27444588cc3d")), + plugins.Must(plugins.New("configuration-as-code:1647.ve39ca_b_829b_42")), plugins.Must(plugins.New("git:5.0.2")), plugins.Must(plugins.New("kubernetes:3937.vd7b_82db_e347b_")), plugins.Must(plugins.New("kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c")), - plugins.Must(plugins.New("job-dsl:1.83")), + plugins.Must(plugins.New("job-dsl:1.84")), plugins.Must(plugins.New("workflow-aggregator:596.v8c21c963d92d")), - plugins.Must(plugins.New("workflow-job:1301.v054d9cea_9593")), + plugins.Must(plugins.New("workflow-job:1308.v58d48a_763b_31")), } func createUserConfigurationSecret(namespace string, stringData map[string]string) { diff --git a/test/e2e/test_utility.go b/test/e2e/test_utility.go index 81c80b9ce..457762358 100644 --- a/test/e2e/test_utility.go +++ b/test/e2e/test_utility.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" ) -const JenkinsTestImage = "jenkins/jenkins:2.387.3-lts" +const JenkinsTestImage = "jenkins/jenkins:2.401.1-lts" var ( Cfg *rest.Config diff --git a/test/helm/helm_test.go b/test/helm/helm_test.go index 6430b8bad..58d2dfc9f 100644 --- a/test/helm/helm_test.go +++ b/test/helm/helm_test.go @@ -47,7 +47,7 @@ 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.387.3-lts"), + "--set-string", fmt.Sprintf("jenkins.image=%s", "jenkins/jenkins:2.401.1-lts"), "--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install") output, err := cmd.CombinedOutput() Expect(err).NotTo(HaveOccurred(), string(output))