chore: prearing version bumpt to v0.8.0-beta2 (#849)

This commit is contained in:
Luigi Operoso 2023-06-06 00:10:36 +02:00 committed by GitHub
parent 813cbc812e
commit 3fe842fff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 16 deletions

View File

@ -54,5 +54,6 @@ jobs:
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request' if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
run: | run: |
git reset --hard git reset --hard
rm bin/sembump
make -C backup/pvc docker-build make -C backup/pvc docker-build
make -C backup/pvc docker-release make -C backup/pvc docker-release

View File

@ -1 +1 @@
v0.8.0-beta v0.8.0-beta2

View File

@ -36,7 +36,7 @@ jenkins:
# image is the name (and tag) of the Jenkins instance # image is the name (and tag) of the Jenkins instance
# Default: jenkins/jenkins:lts # Default: jenkins/jenkins:lts
# It's recommended to use LTS (tag: "lts") version # 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 contains jenkins container environment variables
env: [] env: []
@ -92,15 +92,15 @@ jenkins:
# - name: kubernetes # - name: kubernetes
# version: 3937.vd7b_82db_e347b_ # version: 3937.vd7b_82db_e347b_
# - name: workflow-job # - name: workflow-job
# version: 1301.v054d9cea_9593 # version: 1308.v58d48a_763b_31
# - name: workflow-aggregator # - name: workflow-aggregator
# version: 596.v8c21c963d92d # version: 596.v8c21c963d92d
# - name: git # - name: git
# version: 5.0.2 # version: 5.0.2
# - name: job-dsl # - name: job-dsl
# version: "1.83" # version: "1.84"
# - name: configuration-as-code # - name: configuration-as-code
# version: 1625.v27444588cc3d # version: 1647.ve39ca_b_829b_42
# - name: kubernetes-credentials-provider # - name: kubernetes-credentials-provider
# version: 1.211.vc236a_f5a_2f3c # version: 1.211.vc236a_f5a_2f3c
@ -210,7 +210,7 @@ jenkins:
# image used by backup feature # image used by backup feature
# By default using prebuilt backup PVC image # 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 is backup container name
containerName: backup containerName: backup
@ -294,7 +294,7 @@ operator:
replicaCount: 1 replicaCount: 1
# image is the name (and tag) of the Jenkins Operator image # 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 defines policy for pulling images
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent

View File

@ -13,5 +13,5 @@ GEN_CRD_API=gen-crd-api-reference-docs
IMAGE_PULL_MODE=local IMAGE_PULL_MODE=local
HELM_VERSION=3.1.2 HELM_VERSION=3.1.2
CLUSTER_DOMAIN=cluster.local CLUSTER_DOMAIN=cluster.local
LATEST_LTS_VERSION=2.387.3 LATEST_LTS_VERSION=2.401.1
KIND_CLUSTER_NAME=jenkins KIND_CLUSTER_NAME=jenkins

View File

@ -1,13 +1,13 @@
package plugins package plugins
const ( const (
configurationAsCodePlugin = "configuration-as-code:1625.v27444588cc3d" configurationAsCodePlugin = "configuration-as-code:1647.ve39ca_b_829b_42"
gitPlugin = "git:5.0.2" gitPlugin = "git:5.0.2"
jobDslPlugin = "job-dsl:1.83" jobDslPlugin = "job-dsl:1.84"
kubernetesPlugin = "kubernetes:3937.vd7b_82db_e347b_" kubernetesPlugin = "kubernetes:3937.vd7b_82db_e347b_"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.211.vc236a_f5a_2f3c"
workflowAggregatorPlugin = "workflow-aggregator:596.v8c21c963d92d" 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. // basePluginsList contains plugins to install by operator.

View File

@ -24,13 +24,13 @@ import (
const e2e = "e2e" const e2e = "e2e"
var expectedBasePluginsList = []plugins.Plugin{ 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("git:5.0.2")),
plugins.Must(plugins.New("kubernetes:3937.vd7b_82db_e347b_")), 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("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-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) { func createUserConfigurationSecret(namespace string, stringData map[string]string) {

View File

@ -21,7 +21,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/envtest"
) )
const JenkinsTestImage = "jenkins/jenkins:2.387.3-lts" const JenkinsTestImage = "jenkins/jenkins:2.401.1-lts"
var ( var (
Cfg *rest.Config Cfg *rest.Config

View File

@ -47,7 +47,7 @@ var _ = Describe("Jenkins Controller", func() {
cmd := exec.Command("../../bin/helm", "upgrade", "jenkins", "../../chart/jenkins-operator", "--namespace", namespace.Name, "--debug", 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.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") "--set-string", fmt.Sprintf("operator.image=%s", *imageName), "--install")
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()
Expect(err).NotTo(HaveOccurred(), string(output)) Expect(err).NotTo(HaveOccurred(), string(output))