diff --git a/pkg/clusterinit/onboard/prowjob.go b/pkg/clusterinit/onboard/prowjob.go index e0be35b7540..8d356a4e02b 100644 --- a/pkg/clusterinit/onboard/prowjob.go +++ b/pkg/clusterinit/onboard/prowjob.go @@ -12,6 +12,8 @@ import ( utilpointer "k8s.io/utils/pointer" prowapi "sigs.k8s.io/prow/pkg/apis/prowjobs/v1" prowconfig "sigs.k8s.io/prow/pkg/config" + "sigs.k8s.io/prow/pkg/config/secret" + "sigs.k8s.io/prow/pkg/github" "github.com/openshift/ci-tools/pkg/api" "github.com/openshift/ci-tools/pkg/clusterinit/clusterinstall" @@ -35,16 +37,24 @@ func (s *prowJobStep) Name() string { return "prow-jobs" } func (s *prowJobStep) Run(ctx context.Context) error { s.log = s.log.WithField("step", "jobs") s.log.Infof("generating: presubmits, postsubmits, and periodics for %s", s.clusterInstall.ClusterName) + + gc, _ := github.NewDryRunClient(func() []byte { return []byte("") }, secret.Censor, github.DefaultGraphQLEndpoint, github.DefaultAPIEndpoint) + repo, err := gc.GetRepo("openshift", "release") + if err != nil { + s.log.WithError(err).Fatalf("Error retrieving repository data: %v", err) + } + metadata := RepoMetadata() + metadata.Branch = repo.DefaultBranch + config := prowconfig.JobConfig{ PresubmitsStatic: map[string][]prowconfig.Presubmit{ - "openshift/release": {s.generatePresubmit(s.clusterInstall.ClusterName, *s.clusterInstall.Onboard.OSD, *s.clusterInstall.Onboard.Unmanaged)}, + "openshift/release": {s.generatePresubmit(metadata, s.clusterInstall.ClusterName, *s.clusterInstall.Onboard.OSD, *s.clusterInstall.Onboard.Unmanaged)}, }, PostsubmitsStatic: map[string][]prowconfig.Postsubmit{ - "openshift/release": {s.generatePostsubmit(s.clusterInstall.ClusterName, *s.clusterInstall.Onboard.OSD, *s.clusterInstall.Onboard.Unmanaged)}, + "openshift/release": {s.generatePostsubmit(metadata, s.clusterInstall.ClusterName, *s.clusterInstall.Onboard.OSD, *s.clusterInstall.Onboard.Unmanaged)}, }, - Periodics: []prowconfig.Periodic{s.generatePeriodic(s.clusterInstall.ClusterName, *s.clusterInstall.Onboard.OSD, *s.clusterInstall.Onboard.Unmanaged)}, + Periodics: []prowconfig.Periodic{s.generatePeriodic(metadata, s.clusterInstall.ClusterName, *s.clusterInstall.Onboard.OSD, *s.clusterInstall.Onboard.Unmanaged)}, } - metadata := RepoMetadata() jobsDir := filepath.Join(s.clusterInstall.Onboard.ReleaseRepo, "ci-operator", "jobs") return jobconfig.WriteToDir(jobsDir, metadata.Org, @@ -54,10 +64,10 @@ func (s *prowJobStep) Run(ctx context.Context) error { map[string]string{jobconfig.LabelBuildFarm: s.clusterInstall.ClusterName}) } -func (s *prowJobStep) generatePeriodic(clusterName string, osd bool, unmanaged bool) prowconfig.Periodic { +func (s *prowJobStep) generatePeriodic(metadata *api.Metadata, clusterName string, osd bool, unmanaged bool) prowconfig.Periodic { return prowconfig.Periodic{ JobBase: prowconfig.JobBase{ - Name: RepoMetadata().SimpleJobName(jobconfig.PeriodicPrefix, clusterName+"-apply"), + Name: metadata.SimpleJobName(jobconfig.PeriodicPrefix, clusterName+"-apply"), Agent: string(prowapi.KubernetesAgent), Cluster: string(api.ClusterAPPCI), SourcePath: "", @@ -88,10 +98,10 @@ func (s *prowJobStep) generatePeriodic(clusterName string, osd bool, unmanaged b } } -func (s *prowJobStep) generatePostsubmit(clusterName string, osd bool, unmanaged bool) prowconfig.Postsubmit { +func (s *prowJobStep) generatePostsubmit(metadata *api.Metadata, clusterName string, osd bool, unmanaged bool) prowconfig.Postsubmit { return prowconfig.Postsubmit{ JobBase: prowconfig.JobBase{ - Name: RepoMetadata().JobName(jobconfig.PostsubmitPrefix, clusterName+"-apply"), + Name: metadata.JobName(jobconfig.PostsubmitPrefix, clusterName+"-apply"), Agent: string(prowapi.KubernetesAgent), Cluster: string(api.ClusterAPPCI), SourcePath: "", @@ -116,14 +126,14 @@ func (s *prowJobStep) generatePostsubmit(clusterName string, osd bool, unmanaged } } -func (s *prowJobStep) generatePresubmit(clusterName string, osd bool, unmanaged bool) prowconfig.Presubmit { +func (s *prowJobStep) generatePresubmit(metadata *api.Metadata, clusterName string, osd bool, unmanaged bool) prowconfig.Presubmit { var optional bool if clusterName == string(api.ClusterVSphere02) { optional = true } return prowconfig.Presubmit{ JobBase: prowconfig.JobBase{ - Name: RepoMetadata().JobName(jobconfig.PresubmitPrefix, clusterName+"-dry"), + Name: metadata.JobName(jobconfig.PresubmitPrefix, clusterName+"-dry"), Agent: string(prowapi.KubernetesAgent), Cluster: string(api.ClusterAPPCI), SourcePath: "", diff --git a/pkg/clusterinit/onboard/sanitizeprowjob_test.go b/pkg/clusterinit/onboard/sanitizeprowjob_test.go index f684445f87b..ecb6123038a 100644 --- a/pkg/clusterinit/onboard/sanitizeprowjob_test.go +++ b/pkg/clusterinit/onboard/sanitizeprowjob_test.go @@ -25,20 +25,20 @@ func TestUpdateConfig(t *testing.T) { Groups: dispatcher.JobGroups{ api.ClusterAPPCI: dispatcher.Group{ Jobs: []string{ - "pull-ci-openshift-release-master-build01-dry", - "branch-ci-openshift-release-master-build01-apply", - "periodic-openshift-release-master-build01-apply"}}}, + "pull-ci-openshift-release-main-build01-dry", + "branch-ci-openshift-release-main-build01-apply", + "periodic-openshift-release-main-build01-apply"}}}, }, expected: dispatcher.Config{ Groups: dispatcher.JobGroups{ api.ClusterAPPCI: dispatcher.Group{ Jobs: []string{ - "branch-ci-openshift-release-master-build01-apply", - "branch-ci-openshift-release-master-newcluster-apply", - "periodic-openshift-release-master-build01-apply", - "periodic-openshift-release-master-newcluster-apply", - "pull-ci-openshift-release-master-build01-dry", - "pull-ci-openshift-release-master-newcluster-dry"}}}, + "branch-ci-openshift-release-main-build01-apply", + "branch-ci-openshift-release-main-newcluster-apply", + "periodic-openshift-release-main-build01-apply", + "periodic-openshift-release-main-newcluster-apply", + "pull-ci-openshift-release-main-build01-dry", + "pull-ci-openshift-release-main-newcluster-dry"}}}, }, }, } diff --git a/pkg/clusterinit/onboard/types.go b/pkg/clusterinit/onboard/types.go index f82e240efa9..8fbf78fe8e6 100644 --- a/pkg/clusterinit/onboard/types.go +++ b/pkg/clusterinit/onboard/types.go @@ -20,14 +20,14 @@ const ( ClusterDisplay = "cluster-display" ConfigUpdater = "config-updater" GithubLdapUserGroupCreator = "github-ldap-user-group-creator" - Master = "master" + Main = "main" PodScaler = "pod-scaler" PromotedImageGovernor = "promoted-image-governor" dexManifests = "clusters/app.ci/dex/manifests.yaml" CISchedulingWebhookCommonRelativePath = "../../common_ci_scheduling_webhook" warningHeader = `# !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. @@ -51,7 +51,7 @@ func RepoMetadata() *api.Metadata { return &api.Metadata{ Org: "openshift", Repo: "release", - Branch: "master", + Branch: "main", } } diff --git a/test/integration/cluster-init/update-build99/expected/clusters/app.ci/dex/manifests.yaml b/test/integration/cluster-init/update-build99/expected/clusters/app.ci/dex/manifests.yaml index a2993d3afee..4eda5dcc0d8 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/app.ci/dex/manifests.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/app.ci/dex/manifests.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/admin_cluster_oauth_template.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/admin_cluster_oauth_template.yaml index 6140968af3b..65143922958 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/admin_cluster_oauth_template.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/admin_cluster_oauth_template.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/quayio-pull-through-cache-icsp.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/quayio-pull-through-cache-icsp.yaml index 747fd1f7940..97718ef634a 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/quayio-pull-through-cache-icsp.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/assets/quayio-pull-through-cache-icsp.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cert-manager/certificate.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cert-manager/certificate.yaml index 944b3232d0d..a27e887ac79 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cert-manager/certificate.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cert-manager/certificate.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-operator/admin_ci-operator_rbac.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-operator/admin_ci-operator_rbac.yaml index 6dc5f6340a8..5224ba432b2 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-operator/admin_ci-operator_rbac.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-operator/admin_ci-operator_rbac.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-aarch64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-aarch64.yaml index 84f0782029d..456847970fa 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-aarch64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-aarch64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-amd64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-amd64.yaml index d5c501f5cb8..35f8fabb612 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-amd64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-builds-worker-amd64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-aarch64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-aarch64.yaml index 0013744c33b..87e50e74e63 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-aarch64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-aarch64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-amd64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-amd64.yaml index 77ff30faf92..903dc7ca57d 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-amd64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-longtests-worker-amd64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-aarch64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-aarch64.yaml index 8114e041ab5..1030426f1f7 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-aarch64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-aarch64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-amd64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-amd64.yaml index ae1ff4c86b7..31e2450391a 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-amd64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-prowjobs-worker-amd64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-aarch64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-aarch64.yaml index f0338819b67..c95fad06d3a 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-aarch64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-aarch64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-amd64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-amd64.yaml index a2379aef0ab..7ba3eceddf2 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-amd64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/ci-scheduling-webhook/ci-tests-worker-amd64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloud-credential/cluster-init-credentials-request-aws.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloud-credential/cluster-init-credentials-request-aws.yaml index fa56a165fa7..5d6ac3c98a5 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloud-credential/cluster-init-credentials-request-aws.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloud-credential/cluster-init-credentials-request-aws.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloudability-agent.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloudability-agent.yaml index ef810d0e7e1..d79d49c36ab 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloudability-agent.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/cloudability-agent.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/clusterautoscaler.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/clusterautoscaler.yaml index b125015717c..74f54e09868 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/clusterautoscaler.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/clusterautoscaler.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-aarch64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-aarch64.yaml index d15b87de8df..6ddd399c3df 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-aarch64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-aarch64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-amd64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-amd64.yaml index d51cc5d4b89..f4b0043783d 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-amd64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/infra-amd64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-aarch64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-aarch64.yaml index d82f3e7f653..115766dc2c5 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-aarch64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-aarch64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-amd64.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-amd64.yaml index 47665ef18f9..84ce1dba888 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-amd64.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/machineset/worker-amd64.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/000_mabc-updater_rbac.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/000_mabc-updater_rbac.yaml index 04fb05ebc4b..37c70af863b 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/000_mabc-updater_rbac.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/000_mabc-updater_rbac.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/100_deploy.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/100_deploy.yaml index c2a72e78835..c40d30cfa1f 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/100_deploy.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/multi-arch-builder-controller/100_deploy.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/config-cluster.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/config-cluster.yaml index 33087cdc94e..f6e71e10bd0 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/config-cluster.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/config-cluster.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/imagepruner-cluster.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/imagepruner-cluster.yaml index 3d3da7423df..bf3954a2344 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/imagepruner-cluster.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-image-registry/imagepruner-cluster.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-ingress-operator/ingress-controller-default.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-ingress-operator/ingress-controller-default.yaml index 33410453a62..4b911b1b49d 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-ingress-operator/ingress-controller-default.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-ingress-operator/ingress-controller-default.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-monitoring/cluster-monitoring-config.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-monitoring/cluster-monitoring-config.yaml index 8ef6e8140c6..5f2b8e28d81 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-monitoring/cluster-monitoring-config.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/openshift-monitoring/cluster-monitoring-config.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/supplemental-ci-images/002_ci-tools-build-root-mabc.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/supplemental-ci-images/002_ci-tools-build-root-mabc.yaml index 98d07f1029f..6ddf3cb5e8c 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/supplemental-ci-images/002_ci-tools-build-root-mabc.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/supplemental-ci-images/002_ci-tools-build-root-mabc.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/upgrader-sa.yaml b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/upgrader-sa.yaml index f50eccc99b9..55eb066b284 100644 --- a/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/upgrader-sa.yaml +++ b/test/integration/cluster-init/update-build99/expected/clusters/build-clusters/build99/upgrader-sa.yaml @@ -1,5 +1,5 @@ # !!! WARNING - DO NOT MODIFY !!! -# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/master/cmd/cluster-init +# Generated by cluster-init: https://github.com/openshift/ci-tools/tree/main/cmd/cluster-init # Modifying this file manually might break some tests in both openshift/ci-tools and openshift/release repositories. # Please consider, instead, writing a yaml patch in one of the cluster-install.yaml into clusters/_cluster-install/ # or, alternatively, modifying the cluster-init tool itself. diff --git a/test/integration/cluster-init/update-build99/expected/core-services/sanitize-prow-jobs/_config.yaml b/test/integration/cluster-init/update-build99/expected/core-services/sanitize-prow-jobs/_config.yaml index 40926547388..e940f9a207c 100644 --- a/test/integration/cluster-init/update-build99/expected/core-services/sanitize-prow-jobs/_config.yaml +++ b/test/integration/cluster-init/update-build99/expected/core-services/sanitize-prow-jobs/_config.yaml @@ -10,9 +10,9 @@ default: build01 groups: app.ci: jobs: - - branch-ci-openshift-release-master-build99-apply - - periodic-openshift-release-master-build99-apply - - pull-ci-openshift-release-master-build99-dry + - branch-ci-openshift-release-main-build99-apply + - periodic-openshift-release-main-build99-apply + - pull-ci-openshift-release-main-build99-dry - some-job build01: jobs: diff --git a/test/integration/cluster-init/update-build99/input/core-services/sanitize-prow-jobs/_config.yaml b/test/integration/cluster-init/update-build99/input/core-services/sanitize-prow-jobs/_config.yaml index 63b7e18833f..78eeab499f5 100644 --- a/test/integration/cluster-init/update-build99/input/core-services/sanitize-prow-jobs/_config.yaml +++ b/test/integration/cluster-init/update-build99/input/core-services/sanitize-prow-jobs/_config.yaml @@ -11,10 +11,10 @@ groups: app.ci: jobs: - some-job - - pull-ci-openshift-release-master-build99-dry + - pull-ci-openshift-release-main-build99-dry build01: jobs: - some-other-job kvm: - build02 -sshBastion: build01 \ No newline at end of file +sshBastion: build01