Skip to content

Commit

Permalink
Drop Rafter related configuration (#5386)
Browse files Browse the repository at this point in the history
* Drop Rafter related configuration

* Code review changes

* Fix assertion

* Clear leftovers

* Clear leftovers
  • Loading branch information
kwiatekus committed Jun 20, 2022
1 parent 691ae73 commit 49af222
Show file tree
Hide file tree
Showing 30 changed files with 60 additions and 1,193 deletions.
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/documentation-improvement.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ about: Suggest an improvement or report a bug in the documentation
<!-- Provide the area the document refers to. For example, write:
* Application Connector
* Event Mesh
* Kyma Environment Broker
* Rafter -->
* Kyma Environment Broker -->

**Reasons**

Expand Down
2 changes: 0 additions & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@
/prow/jobs/kyma/tests/end-to-end @wozniakjan @pbochynski @piotrmiskiewicz @pk85 @ralikio @szwedm @tillknuesting @a-thaler @hanngos @k15r @kyma-project/prow
/prow/jobs/kyma/tests/function-controller @a-thaler @pbochynski @pk85 @dbadura @kwiatekus @m00g3n @pprecel @kyma-project/prow
/prow/jobs/kyma/tests/integration @strekm @tomasz-smelcerz-sap @werdes72 @a-thaler @pbochynski @pk85 @dariusztutaj @mjakobczyk @kyma-project/prow
/prow/jobs/kyma/tests/rafter @dbadura @m00g3n @pprecel @kyma-project/prow
/prow/jobs/kyma/tests/serverless-bench @pbochynski @pk85 @dbadura @kwiatekus @m00g3n @pprecel @a-thaler @kyma-project/prow
/prow/jobs/kyma/tools/event-subscriber @a-thaler @friedrichwilken @k15r @mfaizanse @nachtmaar @pxsalehi @vladislavpaskar @pk85 @lilitgh @marcobebway @pbochynski @kyma-project/prow
/prow/jobs/rafter @dbadura @m00g3n @pprecel @kyma-project/prow

/prow/scripts @kyma-project/prow @kyma-project/developers

Expand Down
3 changes: 1 addition & 2 deletions development/test-log-collector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ See the example configuration file:
onlyReportFailure: true
testCases:
- serverless
- rafter
```

Based on that configuration, the Test Log Collector:

- Sends logs from failed `serverless` and `rafter` test cases to `#serverless-core-channel`.
- Sends logs from failed `serverless` test cases to `#serverless-core-channel`.
- Sends logs from the remaining failed and successful test cases to `#default-msg-channel`.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
testCases:
- serverless-long
- serverless
- rafter
- execute-serverlessupgradetest
- prepare-serverlessupgradetest
- channelName: "#framefrog-notifications"
Expand Down
4 changes: 2 additions & 2 deletions development/test-log-collector/pkg/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestLoadDispatchingConfig(t *testing.T) {
channelID: "chanID1"
onlyReportFailure: false
testCases:
- "rafter"
- "busola-migrator"
- channelName: "#serverless-test"
channelID: "chanID2"
onlyReportFailure: true
Expand Down Expand Up @@ -162,7 +162,7 @@ func TestLoadDispatchingConfig(t *testing.T) {
ChannelID: "chanID1",
ChannelName: "#work",
OnlyReportFailure: false,
TestCases: []string{"rafter"},
TestCases: []string{"busola-migrator"},
},
{
ChannelName: "#serverless-test",
Expand Down
2 changes: 1 addition & 1 deletion development/tools/cmd/dnscollector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
dns "google.golang.org/api/dns/v1"
)

const defaultAddressRegexpList = "(remoteenvs-)?gkeint-(pr|commit|rel)-.*,(remoteenvs-)?gke-upgrade-(pr|commit|rel)-.*,(remoteenvs-)?(e2etest),gke-central-(pr|commit|rel)-.*,gke-backup-(pr|commit|rel)-.*,gkecompint-(pr|commit)-.*,gke-minio-(pr|commit)-.*,gke-minio-min-(pr|commit)-.*,apiserver.gke.*"
const defaultAddressRegexpList = "(remoteenvs-)?gkeint-(pr|commit|rel)-.*,(remoteenvs-)?gke-upgrade-(pr|commit|rel)-.*,(remoteenvs-)?(e2etest),gke-central-(pr|commit|rel)-.*,gke-backup-(pr|commit|rel)-.*,gkecompint-(pr|commit)-.*,apiserver.gke.*"
const minAgeInHours = 1
const minPatternLength = 5

Expand Down
14 changes: 1 addition & 13 deletions development/tools/jobs/kyma/kyma_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func TestKymaIntegrationJobPeriodics(t *testing.T) {
require.NoError(t, err)

periodics := jobConfig.AllPeriodics()
assert.Len(t, periodics, 19)
assert.Len(t, periodics, 18)

expName := "kyma-upgrade-k3d-kyma2-to-main"
kymaUpgradePeriodic := tester.FindPeriodicJobByName(periodics, expName)
Expand Down Expand Up @@ -211,18 +211,6 @@ func TestKymaIntegrationJobPeriodics(t *testing.T) {
assert.Equal(t, []string{"-c", "/prow-tools/ipcleaner -project=${CLOUDSDK_CORE_PROJECT} -dry-run=false -ip-exclude-name-regex='^nightly|nightly-(.*)|weekly|weekly-(.*)|nat-auto-ip'"}, addressesCleanerPeriodic.Spec.Containers[0].Args)
tester.AssertThatSpecifiesResourceRequests(t, addressesCleanerPeriodic.JobBase)

expName = "orphaned-az-storage-accounts-cleaner"
orphanedAZStorageAccountsCleaner := tester.FindPeriodicJobByName(periodics, expName)
require.NotNil(t, orphanedAZStorageAccountsCleaner)
assert.Equal(t, expName, orphanedAZStorageAccountsCleaner.Name)

assert.Equal(t, "00 00 * * *", orphanedAZStorageAccountsCleaner.Cron)
tester.AssertThatHasPresets(t, orphanedAZStorageAccountsCleaner.JobBase, "preset-az-kyma-prow-credentials")
tester.AssertThatHasExtraRepoRefCustom(t, orphanedAZStorageAccountsCleaner.JobBase.UtilityConfig, []string{"test-infra"}, []string{"main"})
assert.Equal(t, tester.ImageKymaIntegrationLatest, orphanedAZStorageAccountsCleaner.Spec.Containers[0].Image)
assert.Equal(t, []string{"/home/prow/go/src/github.com/kyma-project/test-infra/prow/scripts/cluster-integration/minio/azure-cleaner.sh"}, orphanedAZStorageAccountsCleaner.Spec.Containers[0].Command)
tester.AssertThatSpecifiesResourceRequests(t, orphanedAZStorageAccountsCleaner.JobBase)

expName = "orphaned-assetstore-gcp-bucket-cleaner"
assetstoreGcpBucketCleaner := tester.FindPeriodicJobByName(periodics, expName)
require.NotNil(t, assetstoreGcpBucketCleaner)
Expand Down
5 changes: 0 additions & 5 deletions development/tools/jobs/kyma/tests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ var tests = []struct {
suite func(config *jobsuite.Config) jobsuite.Suite
additionalOptions []jobsuite.Option
}{
{path: "rafter", image: tester.ImageGolangBuildpack1_16, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("tests-generic"),
},
},
{path: "contract/knative-channel-kafka", image: tester.ImageGolangBuildpack1_16, suite: tester.NewGenericComponentSuite,
additionalOptions: []jobsuite.Option{
jobsuite.JobFileSuffix("tests-generic"),
Expand Down
164 changes: 0 additions & 164 deletions development/tools/jobs/rafter/rafter_test.go

This file was deleted.

50 changes: 0 additions & 50 deletions development/tools/jobs/third-party-images/minio_test.go

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@
"orderBySort": "1",
"queryType": "randomWalk",
"rawQuery": true,
"rawSql": "SELECT\n MIN(CAST(REGEXP_EXTRACT(textPayload, r\"(\\d+\\.\\d+)\") as float64)) as result\n , labels.k8s_pod_prow_k8s_io_job as metric\n , max(timestamp) as timestamp\nFROM `sap-kyma-prow.total_test_coverage.stdout`\nWHERE $__timeFilter(timestamp)\nGROUP BY resource.labels.pod_name, labels.k8s_pod_prow_k8s_io_job\n--HAVING labels.k8s_pod_prow_k8s_io_job = \"pre-rafter\"\nHAVING labels.k8s_pod_prow_k8s_io_job not like \"pre-%\"\nORDER BY timestamp ASC",
"rawSql": "SELECT\n MIN(CAST(REGEXP_EXTRACT(textPayload, r\"(\\d+\\.\\d+)\") as float64)) as result\n , labels.k8s_pod_prow_k8s_io_job as metric\n , max(timestamp) as timestamp\nFROM `sap-kyma-prow.total_test_coverage.stdout`\nWHERE $__timeFilter(timestamp)\nGROUP BY resource.labels.pod_name, labels.k8s_pod_prow_k8s_io_job\n--HAVING labels.k8s_pod_prow_k8s_io_job not like \"pre-%\"\nORDER BY timestamp ASC",
"refId": "A",
"select": [
[
Expand Down
9 changes: 0 additions & 9 deletions prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ tide:
kyma-project/examples: squash
kyma-project/addons: squash
kyma-project/busola-migrator: squash
kyma-project/rafter: squash

kyma-incubator/compass: squash
kyma-incubator/reconciler: squash
Expand Down Expand Up @@ -305,14 +304,6 @@ presets:
- name: pjtester-kubeconfig
mountPath: /etc/kubeconfig/pjtester
readOnly: true
# rafter
- labels:
preset-rafter-build-main: "true"
env:
- name: BUILD_TYPE
value: master
- name: DOCKER_PUSH_DIRECTORY
value: ""
- labels:
preset-sa-prow-job-resource-cleaner: "true"
env:
Expand Down

0 comments on commit 49af222

Please sign in to comment.