Skip to content

Commit

Permalink
Preparation release 1.11 (kyma-project#2151)
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Wałach authored Mar 20, 2020
1 parent cd57076 commit a63506a
Show file tree
Hide file tree
Showing 96 changed files with 240 additions and 583 deletions.
16 changes: 8 additions & 8 deletions development/tools/jobs/incubator/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var components = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{
Expand All @@ -31,7 +31,7 @@ var components = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{
Expand All @@ -52,7 +52,7 @@ var components = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{
Expand All @@ -62,7 +62,7 @@ var components = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{
Expand All @@ -72,7 +72,7 @@ var components = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{
Expand All @@ -92,7 +92,7 @@ var components = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{
Expand All @@ -102,7 +102,7 @@ var components = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},

Expand All @@ -114,7 +114,7 @@ var components = []struct {
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Optional(),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions development/tools/jobs/incubator/tests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var tests = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{
Expand All @@ -41,7 +41,7 @@ var tests = []struct {
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.CompassRepo(),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{
Expand Down
54 changes: 19 additions & 35 deletions development/tools/jobs/kyma/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,78 +17,78 @@ var components = []struct {
{path: "api-controller", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{path: "apiserver-proxy", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{path: "application-broker", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{path: "application-connectivity-certs-setup-job", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "application-connectivity-validator", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "application-gateway", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "application-operator", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "application-registry", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "backup-plugins", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "compass-runtime-agent", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "connection-token-handler", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "connectivity-certs-controller", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
{path: "connector-service", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
jobsuite.JobFileSuffix("generic"),
},
},
Expand All @@ -102,28 +102,20 @@ var components = []struct {
{path: "dex-static-user-configurer", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{path: "etcd-tls-setup-job", image: tester.ImageGolangBuildpack1_11},
{path: "event-bus", image: tester.ImageGolangBuildpack1_11,
additionalOptions: []jobsuite.Option{
jobsuite.Until(releases.Release18),
}},
{path: "event-service", image: tester.ImageGolangBuildpack1_11,
additionalOptions: []jobsuite.Option{
jobsuite.Until(releases.Release18),
}},
{path: "iam-kubeconfig-service", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{path: "istio-kyma-patch", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{path: "istio-installer", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
Expand All @@ -133,18 +125,10 @@ var components = []struct {
},
},
{path: "k8s-dashboard-proxy", image: tester.ImageGolangBuildpack1_11},
{path: "function-controller", image: tester.ImageGolangKubebuilderBuildpackLatest,
additionalOptions: []jobsuite.Option{
jobsuite.Until(releases.Release18),
}},
{path: "kubeless-images/nodejs", image: tester.ImageGolangBuildpack1_11,
additionalOptions: []jobsuite.Option{
jobsuite.Until(releases.Release18),
}},
{path: "kyma-operator", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.AllReleases(),
},
},
{path: "permission-controller", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
Expand All @@ -156,13 +140,13 @@ var components = []struct {
{path: "service-binding-usage-controller", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{path: "xip-patch", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("generic"),
jobsuite.Since(releases.Release18),
jobsuite.Since(releases.Release19),
},
},
{path: "function-controller", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite,
Expand Down
18 changes: 15 additions & 3 deletions development/tools/jobs/kyma/kyma_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ func TestKymaIntegrationVMJobsReleases(t *testing.T) {
assert.False(t, actualPresubmit.AlwaysRun)
assert.Len(t, actualPresubmit.Spec.Containers, 1)
testContainer := actualPresubmit.Spec.Containers[0]
assert.Equal(t, tester.ImageKymaClusterInfraK14, testContainer.Image)
if currentRelease == releases.Release111 {
assert.Equal(t, tester.ImageKymaClusterInfraK16, testContainer.Image)
}else{
assert.Equal(t, tester.ImageKymaClusterInfraK14, testContainer.Image)
}
assert.Len(t, testContainer.Command, 1)
assert.Equal(t, "/home/prow/go/src/github.com/kyma-project/test-infra/prow/scripts/provision-vm-and-start-kyma.sh", testContainer.Command[0])
tester.AssertThatSpecifiesResourceRequests(t, actualPresubmit.JobBase)
Expand All @@ -51,7 +55,11 @@ func TestKymaIntegrationGKEJobsReleases(t *testing.T) {
assert.False(t, actualPresubmit.AlwaysRun)
assert.Len(t, actualPresubmit.Spec.Containers, 1)
testContainer := actualPresubmit.Spec.Containers[0]
assert.Equal(t, tester.ImageKymaClusterInfraK14, testContainer.Image)
if currentRelease == releases.Release111 {
assert.Equal(t, tester.ImageKymaClusterInfraK16, testContainer.Image)
}else{
assert.Equal(t, tester.ImageKymaClusterInfraK14, testContainer.Image)
}
assert.Len(t, testContainer.Command, 1)
tester.AssertThatSpecifiesResourceRequests(t, actualPresubmit.JobBase)
})
Expand All @@ -74,7 +82,11 @@ func TestKymaGKEBackupJobsReleases(t *testing.T) {
assert.False(t, actualPresubmit.AlwaysRun)
assert.Len(t, actualPresubmit.Spec.Containers, 1)
testContainer := actualPresubmit.Spec.Containers[0]
assert.Equal(t, tester.ImageKymaClusterInfraK14, testContainer.Image)
if currentRelease == releases.Release111 {
assert.Equal(t, tester.ImageKymaClusterInfraK16, testContainer.Image)
}else{
assert.Equal(t, tester.ImageKymaClusterInfraK14, testContainer.Image)
}
assert.Len(t, testContainer.Command, 1)
tester.AssertThatSpecifiesResourceRequests(t, actualPresubmit.JobBase)
})
Expand Down
Loading

0 comments on commit a63506a

Please sign in to comment.