Merge pull request #91613 from kalexand-rh/prowupdate

gaurav-nelson · web-flow · commit 49eb7d329ec5 · 2025-04-09T08:11:09.000+10:00
adding a step to rebase against main to the prow config instructions
diff --git a/scripts/prow/README.adoc b/scripts/prow/README.adoc
@@ -41,6 +41,8 @@ To add a new job to Prow CI, run the following commands:
 
 . Switch to you `openshift-docs` directory.
 
+. Check out the `main` branch, fetch from upstream, and rebase against upstream.
+
 . Create the new branch config by running the `add-new-prow-config.sh` script passing the `$VERSION`, `$BRANCH` and `$DISTROS` variables, for example:
 +
 [source,terminal]

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ To add a new job to Prow CI, run the following commands:`
`41`	`41`
`42`	`42`	. Switch to you `openshift-docs` directory.
`43`	`43`
	`44`	+. Check out the `main` branch, fetch from upstream, and rebase against upstream.
	`45`	`+`
`44`	`46`	. Create the new branch config by running the `add-new-prow-config.sh` script passing the `$VERSION`, `$BRANCH` and `$DISTROS` variables, for example:
`45`	`47`	`+`
`46`	`48`	`[source,terminal]`