Skip to content

Commit 1485859

Browse files
author
Hector Vido
committed
Updated branches references from "master" to "main"
1 parent 5b81eec commit 1485859

File tree

69 files changed

+458
-456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+458
-456
lines changed

cmd/autoconfigbrancher/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ be automatically merged (does not need a human approval).
1515

1616
_(subject to bitrot, always consult the code)_
1717

18-
- [ci-operator-yaml-creator](https://github.com/openshift/ci-tools/tree/master/cmd/ci-operator-yaml-creator): ensures
18+
- [ci-operator-yaml-creator](https://github.com/openshift/ci-tools/tree/main/cmd/ci-operator-yaml-creator): ensures
1919
that repositories with in-repo `.ci-operator.yaml` file use `build_root.from_repository: true` in their ci-operator
2020
configs
21-
- [registry-replacer](https://github.com/openshift/ci-tools/tree/master/cmd/registry-replacer): ensures that all builds
21+
- [registry-replacer](https://github.com/openshift/ci-tools/tree/main/cmd/registry-replacer): ensures that all builds
2222
specified in ci-operator configs use a local cluster registry (replaces central registry pullspecs with local
2323
ImageStreamTag references)
24-
- [config-brancher](https://github.com/openshift/ci-tools/tree/master/cmd/config-brancher): propagates ci-operator
24+
- [config-brancher](https://github.com/openshift/ci-tools/tree/main/cmd/config-brancher): propagates ci-operator
2525
config changes from `master`/`main` configs to future release branches
26-
- [ci-operator-config-mirror](https://github.com/openshift/ci-tools/tree/master/cmd/ci-operator-config-mirror):
26+
- [ci-operator-config-mirror](https://github.com/openshift/ci-tools/tree/main/cmd/ci-operator-config-mirror):
2727
propagates ci-operator config changes to private forks in `openshift-priv` organization
28-
- [determinize-ci-operator](https://github.com/openshift/ci-tools/tree/master/cmd/determinize-ci-operator): loads and
28+
- [determinize-ci-operator](https://github.com/openshift/ci-tools/tree/main/cmd/determinize-ci-operator): loads and
2929
saves ci-operator config to fix ordering, formatting etc
30-
- [ci-operator-prowgen](https://github.com/openshift/ci-tools/tree/master/cmd/ci-operator-prowgen): generates Prow job
30+
- [ci-operator-prowgen](https://github.com/openshift/ci-tools/tree/main/cmd/ci-operator-prowgen): generates Prow job
3131
configuration from ci-operator configuration
32-
- [private-prow-configs-mirror](https://github.com/openshift/ci-tools/tree/master/cmd/private-prow-configs-mirror):
32+
- [private-prow-configs-mirror](https://github.com/openshift/ci-tools/tree/main/cmd/private-prow-configs-mirror):
3333
propagates Prow configuration changes to private forks in `openshift-priv` organization
34-
- [determinize-prow-config](https://github.com/openshift/ci-tools/tree/master/cmd/private-prow-configs-mirror): loads
34+
- [determinize-prow-config](https://github.com/openshift/ci-tools/tree/main/cmd/private-prow-configs-mirror): loads
3535
and saves Prow configuration to fix ordering, formatting, proper sharding etc
36-
- [sanitize-prow-jobs](https://github.com/openshift/ci-tools/tree/master/cmd/sanitize-prow-jobs): loads and saves Prow
36+
- [sanitize-prow-jobs](https://github.com/openshift/ci-tools/tree/main/cmd/sanitize-prow-jobs): loads and saves Prow
3737
job configuration to fix ordering, formatting etc. This tool also assigns jobs to build farm clusters.
38-
- [clusterimageset-updater](https://github.com/openshift/ci-tools/tree/master/cmd/clusterimageset-updater): updates
38+
- [clusterimageset-updater](https://github.com/openshift/ci-tools/tree/main/cmd/clusterimageset-updater): updates
3939
cluster pool manifests to use the latest stable OCP releases
4040

4141
## Why it exists
@@ -44,7 +44,7 @@ Over time, we wrote a number of tools that automatically maintain parts of the C
4444
in [openshift/release](https://github.com/openshift/release/) so that we do not need to do so as humans. After some
4545
time, it was annoying to write a PR-creation capability for each tool separately and set up a periodic job for it, so we
4646
started to add new tools as "steps" to the most mature of them (`auto-config-brancher` was originally a tool that simply
47-
ran [config-brancher](https://github.com/openshift/ci-tools/tree/master/cmd/config-brancher), committed the changes and
47+
ran [config-brancher](https://github.com/openshift/ci-tools/tree/main/cmd/config-brancher), committed the changes and
4848
submitted a PR).
4949

5050
## How it works

cmd/autoconfigbrancher/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const (
2929
githubTeam = "openshift/test-platform"
3030
matchTitle = "Automate config brancher"
3131
remoteBranch = "auto-config-brancher"
32+
localBranch = "main"
3233

3334
prowConfigDir = "./core-services/prow/02_config/"
3435
)
@@ -280,7 +281,7 @@ func main() {
280281
logrus.Infof("Self-approving PR by adding the %q and %q labels", labels.Approved, labels.LGTM)
281282
labelsToAdd = append(labelsToAdd, labels.Approved, labels.LGTM)
282283
}
283-
if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, fmt.Sprintf("/cc @%s", o.assign), o.githubLogin+":"+remoteBranch, "master", remoteBranch, true, labelsToAdd, false); err != nil {
284+
if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, fmt.Sprintf("/cc @%s", o.assign), o.githubLogin+":"+remoteBranch, localBranch, remoteBranch, true, labelsToAdd, false); err != nil {
284285
logrus.WithError(err).Fatal("PR creation failed.")
285286
}
286287
}

cmd/autoowners/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Usage of autoowners:
5050
-plugin-config string
5151
Path to plugin config file.
5252
-pr-base-branch string
53-
The base branch to use for the pull request. (default "master")
53+
The base branch to use for the pull request. (default "main")
5454
-repo string
5555
The downstream GitHub repository name. (default "release")
5656
-self-approve approved
@@ -90,4 +90,4 @@ $ /usr/bin/autoowners --github-token-path=/etc/github/oauth --git-name=openshift
9090
```
9191

9292
[openshift/origin]: https://github.com/openshift/origin
93-
[openshift/origin-jobs]: https://github.com/openshift/release/tree/master/ci-operator/jobs/openshift/origin
93+
[openshift/origin-jobs]: https://github.com/openshift/release/tree/main/ci-operator/jobs/openshift/origin

cmd/autoowners/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const (
4040
configSubDirs = "jobs,config,templates"
4141
targetSubDirectory = "ci-operator"
4242

43-
defaultBaseBranch = "master"
43+
defaultBaseBranch = "main"
4444
)
4545

4646
type SimpleConfig = repoowners.SimpleConfig

cmd/autoperibolossync/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ func main() {
144144
}
145145

146146
// TODO fix the bumper in upstream to retrieve a default branch
147-
defaultBranch := "master"
147+
defaultBranch := "main"
148148
if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, o.githubLogin+":"+remoteBranch, defaultBranch, remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
149-
logrus.WithError(err).Fatal("Failed to use 'master' branch")
150-
defaultBranch = "main"
149+
logrus.WithError(err).Fatal("Failed to use 'main' branch")
150+
defaultBranch = "master"
151151
if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, o.githubLogin+":"+remoteBranch, defaultBranch, remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
152152
logrus.WithError(err).Fatal("PR creation failed.")
153153
}

cmd/autopublicizeconfig/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const (
2626
githubOrg = "openshift"
2727
githubRepo = "release"
2828
githubLogin = "openshift-bot"
29+
localBranch = "main"
2930
remoteBranch = "auto-publicize-sync"
3031
privateOrg = "openshift-priv"
3132
matchTitle = "Automate publicize configuration sync"
@@ -168,7 +169,7 @@ func main() {
168169
}
169170

170171
source := fmt.Sprintf("%s:%s", o.githubLogin, remoteBranch)
171-
if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, source, "master", remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
172+
if err := bumper.UpdatePullRequestWithLabels(gc, githubOrg, githubRepo, title, description, source, localBranch, remoteBranch, true, labelsToAdd, o.dryRun); err != nil {
172173
logrus.WithError(err).Fatal("PR creation failed.")
173174
}
174175
}

cmd/branchingconfigmanagers/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ update the CI configuration to match the state expected by the product policy at
1414
### Product Lifecycle Data
1515

1616
The product lifecycle data will be supplied as a YAML file with the following structure (
17-
see https://github.com/openshift/ci-tools/blob/master/pkg/api/ocplifecycle for more details):
17+
see https://github.com/openshift/ci-tools/blob/main/pkg/api/ocplifecycle for more details):
1818

1919
```yaml
2020
ocp:

cmd/ci-images-mirror/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ For example, `registry.ci.openshift.org/namespace/name:tag` is mirrored to
1515
SHA256 hash of the docker image without the prefix `sha256:`.
1616

1717
This tool is extended with the following features (and thus is no longer temporary):
18-
- mirror images from external registries to QCI: See `.supplementalCIImages` of [the configuration file](https://github.com/openshift/release/blob/master/core-services/image-mirroring/_config.yaml).
19-
- mirror ART images from app.ci to QCI: See `.artImages` of [the configuration file](https://github.com/openshift/release/blob/master/core-services/image-mirroring/_config.yaml).
18+
- mirror images from external registries to QCI: See `.supplementalCIImages` of [the configuration file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/_config.yaml).
19+
- mirror ART images from app.ci to QCI: See `.artImages` of [the configuration file](https://github.com/openshift/release/blob/main/core-services/image-mirroring/_config.yaml).
2020

2121
## Run the tool locally
2222

@@ -73,4 +73,4 @@ $ curl -s http://localhost:28090/api/v1/mirrors\?action\=show\&limit\=1 | jq
7373
}
7474

7575
$ oc logs -n ci -l app=ci-images-mirror -c ci-images-mirror -f | grep -i keep-manifest-list
76-
```
76+
```

cmd/ci-operator-checkconfig/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ ci-operator-checkconfig \
3333
```
3434

3535
[openshift_release]: https://github.com/openshift/release.git
36-
[pkg_validation]: https://github.com/openshift/ci-tools/tree/master/pkg/validation
36+
[pkg_validation]: https://github.com/openshift/ci-tools/tree/main/pkg/validation
3737
[presubmit_job]: https://prow.ci.openshift.org/job-history/gs/test-platform-results/pr-logs/directory/pull-ci-openshift-release-master-ci-operator-config

cmd/ci-operator-yaml-creator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func main() {
8484
}
8585
prCreationOps = append(prCreationOps, prcreation.PrBody(`
8686
This is an autogenerated PR that updates the `+"`.ci-operator.yaml`"+`
87-
to reference the `+"`build_root_image`"+` found in the [ci-operator-config](https://github.com/openshift/release/tree/master/ci-operator/config)
87+
to reference the `+"`build_root_image`"+` found in the [ci-operator-config](https://github.com/openshift/release/tree/main/ci-operator/config)
8888
in the [openshift/release](https://github.com/openshift/release) repository.
8989
9090
This is done in preparation for enabling reading the `+"`build_root`"+` from

cmd/cvp-trigger/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ To test the optional operator images built internally in Red Hat, CVP triggers
99
testing jobs via the `cvp-trigger` tool. Currently, the only implemented test
1010
workflow is the one executing the common operator tests (component-agnostic).
1111
For common operator tests, `cvp-trigger` creates a parameterized instance of the
12-
`cpaas-cvp-optional-operator-common-tests` job, living in [openshift/release](https://github.com/openshift/release/blob/master/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml).
12+
`cpaas-cvp-optional-operator-common-tests` job, living in [openshift/release](https://github.com/openshift/release/blob/main/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml).
1313
See the [Triggered Job Interface](#triggered-job-interface) section for details
1414
about the parametrization.
1515

1616
The `cpaas-cvp-optional-operator-common-tests` job runs ci-operator using
17-
a config stored in [redhat-openshift-ecosystem](https://github.com/redhat-openshift-ecosystem/release/tree/master/ci-operator/config/redhat-openshift-ecosystem/playground).
17+
a config stored in [redhat-openshift-ecosystem](https://github.com/redhat-openshift-ecosystem/release/tree/main/ci-operator/config/redhat-openshift-ecosystem/playground).
1818
The exact configuration to use is inferred from the desired OCP version. For
1919
example, for OCP version 4.5, ci-operator uses the config for the
2020
artificial `cvp-ocp-4.5` branch of the `redhat-openshift-ecosystem/playground`

cmd/github-ldap-user-group-creator/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
The groups are used
1111
- by `ci-operator` which promotes the group to the admins of the namespace created for the test.
12-
- in [the manifests](https://github.com/openshift/release/tree/master/clusters) of CI clusters
12+
- in [the manifests](https://github.com/openshift/release/tree/main/clusters) of CI clusters
1313
in the release repo.
1414

1515
## How it works
@@ -31,6 +31,6 @@ This tool is also responsible for deleting the users and their identities on all
3131
## How is it deployed
3232

3333
The periodic
34-
job [periodic-github-ldap-user-group-creator](https://deck-internal-ci.apps.ci.l2s4.p1.openshiftapps.com/?job=periodic-github-ldap-user-group-creator) ([definition](https://github.com/openshift/release/blob/master/ci-operator/jobs/infra-periodics.yaml))
34+
job [periodic-github-ldap-user-group-creator](https://deck-internal-ci.apps.ci.l2s4.p1.openshiftapps.com/?job=periodic-github-ldap-user-group-creator) ([definition](https://github.com/openshift/release/blob/main/ci-operator/jobs/infra-periodics.yaml))
3535
uses `github-ldap-user-group-creator` to create the groups.
36-
The service account RBACs are defined in [admin_github-ldap-user-group-creator_rbac.yaml](https://github.com/openshift/release/blob/master/clusters/build-clusters/common/assets/admin_github-ldap-user-group-creator_rbac.yaml)
36+
The service account RBACs are defined in [admin_github-ldap-user-group-creator_rbac.yaml](https://github.com/openshift/release/blob/main/clusters/build-clusters/common/assets/admin_github-ldap-user-group-creator_rbac.yaml)

cmd/ocp-build-data-enforcer/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func processDockerfile(config ocpbuilddata.OCPImageConfig, processor diffProcess
130130
if !hasDiff {
131131
return nil
132132
}
133-
branch := "master"
133+
branch := "main"
134134
if config.Content != nil && config.Content.Source.Git != nil && strings.HasPrefix(config.Content.Source.Git.Branch.Taget, "openshift-") {
135135
branch = config.Content.Source.Git.Branch.Taget
136136
}
@@ -308,7 +308,7 @@ func (dp *diffProcessor) process() error {
308308
"If you believe the content of this PR is incorrect, please contact the dptp team in",
309309
"#aos-art.",
310310
"",
311-
"[1]: https://github.com/openshift/ci-tools/tree/master/cmd/ocp-build-data-enforcer",
311+
"[1]: https://github.com/openshift/ci-tools/tree/main/cmd/ocp-build-data-enforcer",
312312
"[2]: https://github.com/openshift/ocp-build-data/tree/openshift-4.6/images",
313313
}, "\n")),
314314
); err != nil {

cmd/pj-rehearse/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ func (s *server) prepareCandidate(repoClient git.RepoClient, pullRequest *github
545545
}
546546
candidate := rehearse.RehearsalCandidateFromPullRequest(pullRequest, baseSHA)
547547

548-
// In order to determine *only* the affected jobs from the changes in the PR, we need to rebase onto master
548+
// In order to determine *only* the affected jobs from the changes in the PR, we need to rebase onto main
549549
baseRef := pullRequest.Base.Ref
550550

551551
// In practice, this command sometimes fails due to seemingly transient issues, we should retry it up to 4 times
@@ -561,7 +561,7 @@ func (s *server) prepareCandidate(repoClient git.RepoClient, pullRequest *github
561561
}
562562
}
563563
if !rebased || rebaseErr != nil {
564-
return rehearse.RehearsalCandidate{}, fmt.Errorf("couldn't rebase candidate onto master: %w", err)
564+
return rehearse.RehearsalCandidate{}, fmt.Errorf("couldn't rebase candidate onto main: %w", err)
565565
}
566566

567567
return candidate, nil

cmd/prcreator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func gatherOptions() (*options, error) {
3131
flag.StringVar(&opts.prAssignee, "pr-assignee", "", "Comma separated list of assignees for the PR to create")
3232
flag.StringVar(&opts.organization, "organization", "openshift", "The GitHub organization in which the PR should be created")
3333
flag.StringVar(&opts.repo, "repo", "release", "The name of the repo in which the PR should be created")
34-
flag.StringVar(&opts.branch, "branch", "master", "The branch for which the PR should be created")
34+
flag.StringVar(&opts.branch, "branch", "main", "The branch for which the PR should be created")
3535
flag.Parse()
3636

3737
var errs []error

0 commit comments

Comments
 (0)