Bump version to v0.7.0

test/e2e/jenkins_configuration_test.go

@@ -85,6 +85,7 @@ var _ = Describe("Jenkins controller configuration", func() {
 	})
 
 	AfterEach(func() {
+		ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
 		DestroyNamespace(namespace)
 	})
 
@@ -185,6 +186,7 @@ var _ = Describe("Jenkins controller plugins test", func() {
 	})
 
 	AfterEach(func() {
+		ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
 		DestroyNamespace(namespace)
 	})
 

test/e2e/jenkins_pod_restart_test.go

@@ -91,6 +91,7 @@ var _ = Describe("Jenkins controller", func() {
 	})
 
 	AfterEach(func() {
+		ShowLogsIfTestHasFailed(CurrentGinkgoTestDescription().Failed, namespace.Name)
 		DestroyNamespace(namespace)
 	})
 

test/e2e/seedjobs_test.go

@@ -28,59 +28,6 @@ type seedJobConfig struct {
 	PrivateKey string   `json:"privateKey,omitempty"`
 }
 
-/*
-type seedJobsConfig struct {
-	SeedJobs []seedJobConfig `json:"seedJobs,omitempty"`
-}
-
-// FIXME
-func TestSeedJobs(t *testing.T) {
-	t.Parallel()
-	if seedJobConfigurationFile == nil || len(*seedJobConfigurationFile) == 0 {
-		t.Skipf("Skipping test because flag '%+v' is not set", seedJobConfigurationFile)
-	}
-	seedJobsConfig := loadSeedJobsConfig(t)
-	namespace, ctx := setupTest(t)
-
-	defer showLogsAndCleanup(t, ctx)
-
-	jenkinsCRName := "e2e"
-	var seedJobs []v1alpha2.SeedJob
-
-	// base
-	for _, seedJobConfig := range seedJobsConfig.SeedJobs {
-		createKubernetesCredentialsProviderSecret(t, namespace, seedJobConfig)
-		seedJobs = append(seedJobs, seedJobConfig.SeedJob)
-	}
-	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &seedJobs, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}, "")
-	waitForJenkinsBaseConfigurationToComplete(t, jenkins)
-
-	verifyJenkinsMasterPodAttributes(t, jenkins)
-	jenkinsClient, cleanUpFunc := verifyJenkinsAPIConnection(t, jenkins, namespace)
-	defer cleanUpFunc()
-	verifyPlugins(t, jenkinsClient, jenkins)
-
-	// user
-	waitForJenkinsUserConfigurationToComplete(t, jenkins)
-	verifyJenkinsSeedJobs(t, jenkinsClient, seedJobsConfig.SeedJobs)
-}
-
-func loadSeedJobsConfig() seedJobsConfig {
-	//seedJobConfigurationFile = flag.String(seedJobConfigurationParameterName, "", "path to seed job config")
-	jsonFile, err := os.Open(*seedJobConfigurationFile)
-	Expect(err).NotTo(HaveOccurred())
-	defer func() { _ = jsonFile.Close() }()
-
-	byteValue, err := ioutil.ReadAll(jsonFile)
-	Expect(err).NotTo(HaveOccurred())
-
-	var result seedJobsConfig
-	err = json.Unmarshal(byteValue, &result)
-	Expect(err).NotTo(HaveOccurred())
-	Expect(result.SeedJobs).NotTo(BeEmpty())
-	return result
-}
-*/
 func createKubernetesCredentialsProviderSecret(namespace string, config seedJobConfig) {
 	if config.JenkinsCredentialType == v1alpha2.NoJenkinsCredentialCredentialType {
 		return

test/e2e/test_utility.go

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