From 35c467e2c3030e9e56b629a20b6716e5adae9b2a Mon Sep 17 00:00:00 2001 From: ed382 <174873053+ed382@users.noreply.github.com> Date: Tue, 17 Sep 2024 10:11:32 +0200 Subject: [PATCH] feat: remove develop branch (#5848) --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/docker-build-develop.yaml | 2 +- .github/workflows/scorecard.yml | 2 +- .github/workflows/test.yaml | 4 ++-- contrib/docker/jmeter/jmeter5.5.ubi8.8.Dockerfile | 2 +- contrib/executor/jmeterd/examples/gitflow/README.md | 6 +++--- contrib/executor/kubepug/pkg/runner/runner_test.go | 6 +++--- .../executor-smoke/crd/playwright.yaml | 2 +- test/examples/cloud-demo/tests/playwright.yaml | 2 +- test/examples/kubecon/tests/playwright.yaml | 2 +- .../crd-workflow/testkube-integration-tests.yaml | 2 +- test/jmeter/executor-tests/crd/special-cases.yaml | 10 +++++----- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1ca470df7cd..6bbfd473b48 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,7 +13,7 @@ name: "CodeQL" on: push: - branches: [ main, develop ] + branches: [ main ] paths: - 'cmd/**' - 'pkg/**' @@ -21,7 +21,7 @@ on: - 'contrib/**' pull_request: # The branches below must be a subset of the branches above - branches: [ main, develop ] + branches: [ main ] paths: - 'cmd/**' - 'pkg/**' diff --git a/.github/workflows/docker-build-develop.yaml b/.github/workflows/docker-build-develop.yaml index 7dd5b3201a8..993f2bfaf88 100644 --- a/.github/workflows/docker-build-develop.yaml +++ b/.github/workflows/docker-build-develop.yaml @@ -2,7 +2,7 @@ name: Docker images build develop on: push: branches: - - develop + - main paths-ignore: - 'docs/**' env: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index be640adc671..6d31002e544 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -12,7 +12,7 @@ on: schedule: - cron: '35 11 * * 1' push: - branches: [ "develop" ] + branches: [ "main" ] # Declare default permissions as read only. permissions: read-all diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e8317cfa3d8..437aa02fbdb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -2,11 +2,11 @@ name: Code build and checks on: push: - branches: [main, develop] + branches: [main] paths-ignore: "docs/**" pull_request: paths-ignore: "docs/**" - branches: [main, develop] + branches: [main] jobs: unit-tests: diff --git a/contrib/docker/jmeter/jmeter5.5.ubi8.8.Dockerfile b/contrib/docker/jmeter/jmeter5.5.ubi8.8.Dockerfile index a84d1ebf2ac..6b64148822c 100644 --- a/contrib/docker/jmeter/jmeter5.5.ubi8.8.Dockerfile +++ b/contrib/docker/jmeter/jmeter5.5.ubi8.8.Dockerfile @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.title="JMeter" org.opencontainers.image.maintainer="support@testkube.io" \ org.opencontainers.image.vendor="testkube" \ org.opencontainers.image.url="https://cloud.testkube.io" \ - org.opencontainers.image.source="https://github.com/kubeshop/testkube/tree/develop/contrib/docker/jmeter" + org.opencontainers.image.source="https://github.com/kubeshop/testkube/tree/main/contrib/docker/jmeter" # Update the system and install required libraries RUN microdnf update -y && \ diff --git a/contrib/executor/jmeterd/examples/gitflow/README.md b/contrib/executor/jmeterd/examples/gitflow/README.md index 233d63df6f3..421f63a854c 100644 --- a/contrib/executor/jmeterd/examples/gitflow/README.md +++ b/contrib/executor/jmeterd/examples/gitflow/README.md @@ -26,7 +26,7 @@ All the plugins required by the test are kept in the `plugins` directory of the 2. Type a test name (i.e. `jmeterd-example`) and select `jmeterd/test` as test type. 3. Select `Git` as the source type and fill the following details: * Git Repository URI: https://github.com/kubeshop/testkube - * Branch: develop + * Branch: main * Path: contrib/executor/jmeterd/examples/gitflow 4. Click **Create** to create the test. 5. Select **Settings** tab and then open the **Variables & Secrets** tab from the left menu. @@ -56,7 +56,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube - branch: develop + branch: main path: contrib/executor/jmeterd/examples/gitflow executionRequest: variables: @@ -71,4 +71,4 @@ spec: args: - "-GJMETER_UC1_NBUSERS=5" - "jmeter-properties-external.jmx" -``` \ No newline at end of file +``` diff --git a/contrib/executor/kubepug/pkg/runner/runner_test.go b/contrib/executor/kubepug/pkg/runner/runner_test.go index aac948245d9..b5b96c4194a 100644 --- a/contrib/executor/kubepug/pkg/runner/runner_test.go +++ b/contrib/executor/kubepug/pkg/runner/runner_test.go @@ -293,7 +293,7 @@ func TestRunGitFile_Integration(t *testing.T) { repo := &testkube.Repository{ Uri: "https://github.com/kubeshop/testkube", - Branch: "develop", + Branch: "main", Path: "contrib/executor/kubepug/pkg/runner/test-files/fake-manifest.yaml", } _, err = content.NewFetcher(tempDir).FetchGit(repo) @@ -329,7 +329,7 @@ func TestRunGitFile_Integration(t *testing.T) { repo := &testkube.Repository{ Uri: "https://github.com/kubeshop/testkube", - Branch: "develop", + Branch: "main", Path: "contrib/executor/kubepug/pkg/runner/test-files/manifest-deprecated.yaml", } _, err = content.NewFetcher(tempDir).FetchGit(repo) @@ -376,7 +376,7 @@ func TestRunGitDirectory_Integration(t *testing.T) { repo := &testkube.Repository{ Uri: "https://github.com/kubeshop/testkube", - Branch: "develop", + Branch: "main", Path: "contrib/executor/kubepug/pkg/runner/test-files/manifest-valid", } _, err = content.NewFetcher(tempDir).FetchGit(repo) diff --git a/test/container-executor/executor-smoke/crd/playwright.yaml b/test/container-executor/executor-smoke/crd/playwright.yaml index d7098cd0d6e..b4daf5e302c 100644 --- a/test/container-executor/executor-smoke/crd/playwright.yaml +++ b/test/container-executor/executor-smoke/crd/playwright.yaml @@ -11,7 +11,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube - branch: develop + branch: main path: test/playwright/executor-tests/playwright-project workingDir: test/playwright/executor-tests/playwright-project executionRequest: diff --git a/test/examples/cloud-demo/tests/playwright.yaml b/test/examples/cloud-demo/tests/playwright.yaml index 7bd6de4b9f5..37303dacca0 100644 --- a/test/examples/cloud-demo/tests/playwright.yaml +++ b/test/examples/cloud-demo/tests/playwright.yaml @@ -24,7 +24,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube - branch: develop + branch: main path: test/playwright/executor-tests/playwright-project workingDir: test/playwright/executor-tests/playwright-project executionRequest: diff --git a/test/examples/kubecon/tests/playwright.yaml b/test/examples/kubecon/tests/playwright.yaml index 05893a3936b..e80ef0ba0d2 100644 --- a/test/examples/kubecon/tests/playwright.yaml +++ b/test/examples/kubecon/tests/playwright.yaml @@ -24,7 +24,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube - branch: develop + branch: main path: test/playwright/executor-tests/playwright-project workingDir: test/playwright/executor-tests/playwright-project executionRequest: diff --git a/test/integration/crd-workflow/testkube-integration-tests.yaml b/test/integration/crd-workflow/testkube-integration-tests.yaml index 67c47bcd43e..606bb9a5070 100644 --- a/test/integration/crd-workflow/testkube-integration-tests.yaml +++ b/test/integration/crd-workflow/testkube-integration-tests.yaml @@ -8,7 +8,7 @@ spec: config: revision: type: string - default: develop + default: main content: git: uri: https://github.com/kubeshop/testkube.git diff --git a/test/jmeter/executor-tests/crd/special-cases.yaml b/test/jmeter/executor-tests/crd/special-cases.yaml index 5204ea3303a..ca20dc039b9 100644 --- a/test/jmeter/executor-tests/crd/special-cases.yaml +++ b/test/jmeter/executor-tests/crd/special-cases.yaml @@ -178,7 +178,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube.git - branch: develop + branch: main path: test/jmeter/executor-tests executionRequest: args: @@ -212,7 +212,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube.git - branch: develop + branch: main path: test/jmeter/executor-tests executionRequest: args: @@ -251,7 +251,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube.git - branch: develop + branch: main path: test/jmeter/executor-tests workingDir: test/jmeter/executor-tests executionRequest: @@ -428,7 +428,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube.git - branch: develop + branch: main path: test/jmeter/executor-tests/jmeter-executor-smoke-incorrect-url-2.jmx executionRequest: jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: \"{{ .Name }}\"\n image: {{ .Image }}\n resources:\n requests:\n memory: 512Mi\n cpu: 512m\n" @@ -455,7 +455,7 @@ spec: repository: type: git uri: https://github.com/kubeshop/testkube.git - branch: develop + branch: main path: test/jmeter/executor-tests/jmeter-executor-smoke-incorrect-url-2.jmx executionRequest: jobTemplate: "apiVersion: batch/v1\nkind: Job\nspec:\n template:\n spec:\n containers:\n - name: \"{{ .Name }}\"\n image: {{ .Image }}\n resources:\n requests:\n memory: 512Mi\n cpu: 512m\n"