Skip to content

Commit

Permalink
feat: remove develop branch (#5848)
Browse files Browse the repository at this point in the history
  • Loading branch information
ed382 authored Sep 17, 2024
1 parent 6066f7e commit 35c467e
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ name: "CodeQL"

on:
push:
branches: [ main, develop ]
branches: [ main ]
paths:
- 'cmd/**'
- 'pkg/**'
- 'internal/**'
- 'contrib/**'
pull_request:
# The branches below must be a subset of the branches above
branches: [ main, develop ]
branches: [ main ]
paths:
- 'cmd/**'
- 'pkg/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-develop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Docker images build develop
on:
push:
branches:
- develop
- main
paths-ignore:
- 'docs/**'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
schedule:
- cron: '35 11 * * 1'
push:
branches: [ "develop" ]
branches: [ "main" ]

# Declare default permissions as read only.
permissions: read-all
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion contrib/docker/jmeter/jmeter5.5.ubi8.8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.title="JMeter"
org.opencontainers.image.maintainer="[email protected]" \
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 && \
Expand Down
6 changes: 3 additions & 3 deletions contrib/executor/jmeterd/examples/gitflow/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand All @@ -71,4 +71,4 @@ spec:
args:
- "-GJMETER_UC1_NBUSERS=5"
- "jmeter-properties-external.jmx"
```
```
6 changes: 3 additions & 3 deletions contrib/executor/kubepug/pkg/runner/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/container-executor/executor-smoke/crd/playwright.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/examples/cloud-demo/tests/playwright.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/examples/kubecon/tests/playwright.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
config:
revision:
type: string
default: develop
default: main
content:
git:
uri: https://github.com/kubeshop/testkube.git
Expand Down
10 changes: 5 additions & 5 deletions test/jmeter/executor-tests/crd/special-cases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit 35c467e

Please sign in to comment.