Skip to content

Update branch ref for openshift/release from master to main #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Feb 10, 2026
+11 −11
Merged

Update branch ref for openshift/release from master to main #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/release-generate-ci-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ 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 }}
Expand All @@ -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' }}
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-generate-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand All @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion pkg/prowgen/prowgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/prowgen/prowgen_tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/prowgen/prowgen_tests_discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading