From 3315d6ca9ba3097485786d2a5a012674465bcf89 Mon Sep 17 00:00:00 2001 From: Suleyman Akbas Date: Wed, 15 Jan 2020 11:17:11 +0100 Subject: [PATCH] Refactor backup tests (#1926) --- .../tools/jobs/kyma/kyma_integration_test.go | 2 +- development/tools/jobs/kyma/tests_test.go | 9 ++---- prow/jobs/kyma/kyma-integration.yaml | 2 +- .../backup-restore-test.yaml | 30 ------------------- .../backup-generic.yaml} | 12 ++++---- templates/config.yaml | 12 +++----- templates/templates/kyma-integration.yaml | 2 +- 7 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test.yaml rename prow/jobs/kyma/tests/end-to-end/{backup-restore-test/backup-restore-test-generic.yaml => backup/backup-generic.yaml} (78%) diff --git a/development/tools/jobs/kyma/kyma_integration_test.go b/development/tools/jobs/kyma/kyma_integration_test.go index 3f1c3c4e310f..8c10124d5ee2 100644 --- a/development/tools/jobs/kyma/kyma_integration_test.go +++ b/development/tools/jobs/kyma/kyma_integration_test.go @@ -219,7 +219,7 @@ func TestKymaBackupTestJobPresubmit(t *testing.T) { // then assert.True(t, actualJob.Decorate) assert.False(t, actualJob.Optional) - assert.Equal(t, "^((resources/backup\\S+|tests/end-to-end/backup-restore-test/deploy/chart/backup-test/\\S+)(\\.[^.][^.][^.]+$|\\.[^.][^dD]$|\\.[^mM][^.]$|\\.[^.]$|/[^.]+$))", actualJob.RunIfChanged) + assert.Equal(t, "^((resources/backup\\S+|tests/end-to-end/backup/chart/backup-test/\\S+)(\\.[^.][^.][^.]+$|\\.[^.][^dD]$|\\.[^mM][^.]$|\\.[^.]$|/[^.]+$))", actualJob.RunIfChanged) tester.AssertThatHasPresets(t, actualJob.JobBase, preset.KymaBackupRestoreBucket, preset.KymaBackupCredentials, preset.GCProjectEnv, preset.BuildPr, preset.SaGKEKymaIntegration, "preset-weekly-github-integration") tester.AssertThatHasExtraRefTestInfra(t, actualJob.JobBase.UtilityConfig, "master") diff --git a/development/tools/jobs/kyma/tests_test.go b/development/tools/jobs/kyma/tests_test.go index aca3eff36dc5..d0ef08449323 100644 --- a/development/tools/jobs/kyma/tests_test.go +++ b/development/tools/jobs/kyma/tests_test.go @@ -69,10 +69,6 @@ var tests = []struct { jobsuite.RunIfChanged("components/console-backend-service/main.go", "scripts/go-dep.mk"), }, }, - {path: "end-to-end/backup-restore-test", image: tester.ImageGolangBuildpack1_11, - additionalOptions: []jobsuite.Option{ - jobsuite.Until(releases.Release18), - }}, {path: "end-to-end/external-solution-integration", image: tester.ImageGolangBuildpack1_11}, {path: "end-to-end/upgrade", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite, additionalOptions: []jobsuite.Option{ jobsuite.RunIfChanged("^tests/end-to-end/upgrade/[^chart]", "tests/end-to-end/upgrade/fix"), @@ -173,10 +169,11 @@ var tests = []struct { jobsuite.Since(releases.Release19), }, }, - {path: "end-to-end/backup-restore-test", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite, + {path: "end-to-end/backup", image: tester.ImageBootstrap20181204, suite: tester.NewGenericComponentSuite, additionalOptions: []jobsuite.Option{ jobsuite.JobFileSuffix("generic"), - jobsuite.Since(releases.Release19), + jobsuite.Since(releases.Release110), + jobsuite.Optional(), }, }, {path: "knative-build", image: tester.ImageGolangBuildpack1_11, diff --git a/prow/jobs/kyma/kyma-integration.yaml b/prow/jobs/kyma/kyma-integration.yaml index 86fa13af6b98..1f6d050d90ac 100644 --- a/prow/jobs/kyma/kyma-integration.yaml +++ b/prow/jobs/kyma/kyma-integration.yaml @@ -524,7 +524,7 @@ presubmits: # runs on PRs - ^master$ <<: *gke_backup_job_template # following regexp won't start build if only Markdown files were changed - run_if_changed: "^((resources/backup\\S+|tests/end-to-end/backup-restore-test/deploy/chart/backup-test/\\S+)(\\.[^.][^.][^.]+$|\\.[^.][^dD]$|\\.[^mM][^.]$|\\.[^.]$|/[^.]+$))" + run_if_changed: "^((resources/backup\\S+|tests/end-to-end/backup/chart/backup-test/\\S+)(\\.[^.][^.][^.]+$|\\.[^.][^dD]$|\\.[^mM][^.]$|\\.[^.]$|/[^.]+$))" labels: preset-build-pr: "true" <<: *gke_backup_job_labels_template diff --git a/prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test.yaml b/prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test.yaml deleted file mode 100644 index bc966303531f..000000000000 --- a/prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# Code generated by rendertemplates. DO NOT EDIT. - -test_infra_ref: &test_infra_ref - org: kyma-project - repo: test-infra - path_alias: github.com/kyma-project/test-infra - -job_template: &job_template - skip_report: false - decorate: true - max_concurrency: 10 - -job_labels_template: &job_labels_template - preset-dind-enabled: "true" - preset-sa-gcr-push: "true" - preset-docker-push-repository-kyma: "true" - -container_template: &container_template - securityContext: - privileged: true - command: - - "/home/prow/go/src/github.com/kyma-project/test-infra/prow/scripts/build.sh" - resources: - requests: - memory: 1.5Gi - cpu: 0.8 - -presubmits: # runs on PRs - kyma-project/kyma: - diff --git a/prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test-generic.yaml b/prow/jobs/kyma/tests/end-to-end/backup/backup-generic.yaml similarity index 78% rename from prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test-generic.yaml rename to prow/jobs/kyma/tests/end-to-end/backup/backup-generic.yaml index 1cbf20f42bef..42eae8b0062a 100644 --- a/prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test-generic.yaml +++ b/prow/jobs/kyma/tests/end-to-end/backup/backup-generic.yaml @@ -14,13 +14,13 @@ job_template: &job_template preset-dind-enabled: "true" preset-sa-gcr-push: "true" preset-docker-push-repository-kyma: "true" + prow.kyma-project.io/slack.skipReport: "true" extra_refs: - <<: *test_infra_ref base_ref: master branches: - ^master$ - - ^release-(1\.9)-backup-restore-test$ - run_if_changed: "^tests/end-to-end/backup-restore-test/|^common/makefiles/" + run_if_changed: "^tests/end-to-end/backup/|^common/makefiles/" spec: containers: - image: eu.gcr.io/kyma-project/prow/test-infra/bootstrap:v20181204-a6e79be @@ -29,7 +29,7 @@ job_template: &job_template command: - "/home/prow/go/src/github.com/kyma-project/test-infra/prow/scripts/build-generic.sh" args: - - "/home/prow/go/src/github.com/kyma-project/kyma/tests/end-to-end/backup-restore-test" + - "/home/prow/go/src/github.com/kyma-project/kyma/tests/end-to-end/backup" resources: requests: memory: 1.5Gi @@ -37,12 +37,12 @@ job_template: &job_template presubmits: # runs on PRs kyma-project/kyma: - - name: pre-kyma-tests-end-to-end-backup-restore-test + - name: pre-kyma-tests-end-to-end-backup skip_report: false - optional: false + optional: true <<: *job_template postsubmits: kyma-project/kyma: - - name: post-kyma-tests-end-to-end-backup-restore-test + - name: post-kyma-tests-end-to-end-backup <<: *job_template diff --git a/templates/config.yaml b/templates/config.yaml index 585b0127fcd3..4533689a39a7 100644 --- a/templates/config.yaml +++ b/templates/config.yaml @@ -453,11 +453,12 @@ templates: <<: *kyma_generic_component path: tests/knative-serving since: "1.9" - - to: ../prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test-generic.yaml + - to: ../prow/jobs/kyma/tests/end-to-end/backup/backup-generic.yaml values: <<: *kyma_generic_component - path: tests/end-to-end/backup-restore-test - since: "1.9" + path: tests/end-to-end/backup + since: "1.10" + optional: true - to: ../prow/jobs/kyma/tests/rafter/rafter-tests-generic.yaml values: <<: *kyma_generic_component @@ -743,11 +744,6 @@ templates: values: <<: *go_kyma_component_1_11 path: tests/end-to-end/external-solution-integration - - to: ../prow/jobs/kyma/tests/end-to-end/backup-restore-test/backup-restore-test.yaml - values: - <<: *go_kyma_component_1_11 - path: tests/end-to-end/backup-restore-test - until: "1.8" - to: ../prow/jobs/kyma/tests/integration/dex/dex-tests.yaml values: <<: *go_kyma_component_1_12 diff --git a/templates/templates/kyma-integration.yaml b/templates/templates/kyma-integration.yaml index 56c5dd9c4b5e..7440e170a3f8 100644 --- a/templates/templates/kyma-integration.yaml +++ b/templates/templates/kyma-integration.yaml @@ -393,7 +393,7 @@ presubmits: # runs on PRs - ^master$ <<: *gke_backup_job_template # following regexp won't start build if only Markdown files were changed - run_if_changed: "^((resources/backup\\S+|tests/end-to-end/backup-restore-test/deploy/chart/backup-test/\\S+)(\\.[^.][^.][^.]+$|\\.[^.][^dD]$|\\.[^mM][^.]$|\\.[^.]$|/[^.]+$))" + run_if_changed: "^((resources/backup\\S+|tests/end-to-end/backup/chart/backup-test/\\S+)(\\.[^.][^.][^.]+$|\\.[^.][^dD]$|\\.[^mM][^.]$|\\.[^.]$|/[^.]+$))" labels: preset-build-pr: "true" <<: *gke_backup_job_labels_template