You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: scripts/README.md
+22-4
Original file line number
Diff line number
Diff line change
@@ -5,6 +5,17 @@ All of the staged repositories live in the top level `staging` directory.
5
5
The downstreaming process is complex and helper scripts have been written
6
6
to facilitate downstreaming.
7
7
8
+
## Automatic Downstreaming
9
+
10
+
There is now an automated downstreaming process for OLMv0 from the three
11
+
source repositories.
12
+
13
+
The "bumper" program is located in [openshift/operator-framework-tooling](https://github.com/openshift/operator-framework-tooling).
14
+
It is automatically run on a daily basis based on the following [openshift/release](https://github.com/openshift/release/blob/3bf0b3ae011debaefefb564ad6f233c380d033f7/ci-operator/jobs/infra-periodics.yaml#L926-L978) config.
15
+
16
+
If the bumper program fails to create a mergeable PR, manual intervention will be necessary.
17
+
This may require copying, modifying and resubmitting the PR.
18
+
8
19
## Assumptions
9
20
10
21
The helper scripts assume that the upstream remote repos are configured
@@ -19,6 +30,9 @@ remote repositories.
19
30
20
31
## Bulk Sync
21
32
33
+
**NOTE**: This should no longer be necessary, given the "bumper" program above.
34
+
The "bumper" program can be used instead of the following process.
35
+
22
36
To sync all current changes from upstream, simply run the sync script:
23
37
```sh
24
38
scripts/sync.sh
@@ -54,14 +68,18 @@ file in the repositry root directory with the repos and commit SHAs.
54
68
55
69
The format of the cherrypick file is:
56
70
```
57
-
<order> <repo> <commit-SHA>
71
+
<date-order> <commit-order> <repo> <commit-SHA>
58
72
```
59
73
74
+
* The `<date-order>` field is usually an ISO date without spaces.
75
+
* The `<commit-order>` field is a sequential number indicating the order of a commit within a pull request.
76
+
* For this _manual_ purpose, both can just be the same sequential number.
0 commit comments