From 194bbb65ed9fd1135ec19b37d276e4ba498c3446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Tue, 10 Feb 2026 10:40:14 +0100 Subject: [PATCH] Update branch ref for openshift/release from master to main --- .github/workflows/release-generate-ci-template.yaml | 8 ++++---- .github/workflows/release-generate-ci.yaml | 8 ++++---- pkg/prowgen/prowgen.go | 2 +- pkg/prowgen/prowgen_tests.go | 2 +- pkg/prowgen/prowgen_tests_discovery_test.go | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-generate-ci-template.yaml b/.github/workflows/release-generate-ci-template.yaml index a83de9300..9e7c2b515 100644 --- a/.github/workflows/release-generate-ci-template.yaml +++ b/.github/workflows/release-generate-ci-template.yaml @@ -56,7 +56,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} uses: actions/checkout@v4 with: - ref: 'master' + ref: 'main' repository: 'openshift/release' path: ./src/github.com/openshift-knative/hack/openshift/release @@ -64,7 +64,7 @@ jobs: if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} uses: actions/checkout@v4 with: - ref: 'master' + ref: 'main' repository: 'openshift/release' path: ./src/github.com/openshift-knative/hack/openshift/release token: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -76,7 +76,7 @@ jobs: - name: Generate CI working-directory: ./src/github.com/openshift-knative/hack - run: make generate-ci-no-clean ARGS=--branch=master + run: make generate-ci-no-clean ARGS=--branch=main - name: Create Pull Request - openshift/release if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} @@ -98,7 +98,7 @@ jobs: else git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/release.git" "$branch:$branch" -f fi - gh pr create --base master --head "serverless-qe:$branch" --fill-verbose || true + gh pr create --base main --head "serverless-qe:$branch" --fill-verbose || true working-directory: ./src/github.com/openshift-knative/hack/openshift/release - name: Create Pull Request - openshift-knative/hack diff --git a/.github/workflows/release-generate-ci.yaml b/.github/workflows/release-generate-ci.yaml index 43c7e6d21..8814dc020 100644 --- a/.github/workflows/release-generate-ci.yaml +++ b/.github/workflows/release-generate-ci.yaml @@ -150,14 +150,14 @@ jobs: if: ${{ github.event_name == 'pull_request' }} uses: actions/checkout@v4 with: - ref: 'master' + ref: 'main' repository: 'openshift/release' path: ./src/github.com/openshift-knative/hack/openshift/release - name: Checkout openshift/release if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} uses: actions/checkout@v4 with: - ref: 'master' + ref: 'main' repository: 'openshift/release' path: ./src/github.com/openshift-knative/hack/openshift/release token: ${{ secrets.SERVERLESS_QE_ROBOT }} @@ -167,7 +167,7 @@ jobs: git config --global user.name "serverless-qe" - name: Generate CI working-directory: ./src/github.com/openshift-knative/hack - run: make generate-ci-no-clean ARGS=--branch=master + run: make generate-ci-no-clean ARGS=--branch=main - name: Create Pull Request - openshift/release if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} env: @@ -188,7 +188,7 @@ jobs: else git push "https://serverless-qe:${GH_TOKEN}@github.com/serverless-qe/release.git" "$branch:$branch" -f fi - gh pr create --base master --head "serverless-qe:$branch" --fill-verbose || true + gh pr create --base main --head "serverless-qe:$branch" --fill-verbose || true working-directory: ./src/github.com/openshift-knative/hack/openshift/release - name: Create Pull Request - openshift-knative/hack if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule') && github.ref_name == 'main' }} diff --git a/pkg/prowgen/prowgen.go b/pkg/prowgen/prowgen.go index b1833df3d..8bcae8271 100644 --- a/pkg/prowgen/prowgen.go +++ b/pkg/prowgen/prowgen.go @@ -538,7 +538,7 @@ func InitializeOpenShiftReleaseRepository(ctx context.Context, openShiftRelease if err := GitMirror(ctx, openShiftRelease); err != nil { return err } - if err := GitCheckout(ctx, openShiftRelease, "master"); err != nil { + if err := GitCheckout(ctx, openShiftRelease, "main"); err != nil { return err } diff --git a/pkg/prowgen/prowgen_tests.go b/pkg/prowgen/prowgen_tests.go index fac97c78c..6568b35e9 100644 --- a/pkg/prowgen/prowgen_tests.go +++ b/pkg/prowgen/prowgen_tests.go @@ -188,7 +188,7 @@ func DiscoverTests(r Repository, openShift OpenShift, sourceImageName string, sk LiteralTestStep: &cioperatorapi.LiteralTestStep{ As: "openshift-gather-extra", From: sourceImageName, - Commands: `curl -skSL https://raw.githubusercontent.com/openshift/release/master/ci-operator/step-registry/gather/extra/gather-extra-commands.sh | /bin/bash -s`, + Commands: `curl -skSL https://raw.githubusercontent.com/openshift/release/main/ci-operator/step-registry/gather/extra/gather-extra-commands.sh | /bin/bash -s`, GracePeriod: &prowapi.Duration{Duration: 60 * time.Second}, Resources: cioperatorapi.ResourceRequirements{ Requests: cioperatorapi.ResourceList{ diff --git a/pkg/prowgen/prowgen_tests_discovery_test.go b/pkg/prowgen/prowgen_tests_discovery_test.go index ed863e924..3b5ce179b 100644 --- a/pkg/prowgen/prowgen_tests_discovery_test.go +++ b/pkg/prowgen/prowgen_tests_discovery_test.go @@ -729,7 +729,7 @@ func mustGatherSteps(sourceImage string, optionalOnSuccess bool) []cioperatorapi LiteralTestStep: &cioperatorapi.LiteralTestStep{ As: "openshift-gather-extra", From: sourceImage, - Commands: `curl -skSL https://raw.githubusercontent.com/openshift/release/master/ci-operator/step-registry/gather/extra/gather-extra-commands.sh | /bin/bash -s`, + Commands: `curl -skSL https://raw.githubusercontent.com/openshift/release/main/ci-operator/step-registry/gather/extra/gather-extra-commands.sh | /bin/bash -s`, GracePeriod: &prowapi.Duration{Duration: 60 * time.Second}, Resources: cioperatorapi.ResourceRequirements{ Requests: cioperatorapi.ResourceList{