Skip to content

Commit 4bae5e3

Browse files
authored
ACM: cut foundation repos to release 2.14 (#61823)
Signed-off-by: zhujian <[email protected]>
1 parent 28f94c4 commit 4bae5e3

File tree

48 files changed

+6940
-23
lines changed

Some content is hidden

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

48 files changed

+6940
-23
lines changed

ci-operator/config/stolostron/acm-workload/stolostron-acm-workload-main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ tests:
5151
postsubmit: true
5252
steps:
5353
env:
54-
DESTINATION_BRANCH: release-2.12
54+
DESTINATION_BRANCH: release-2.13
5555
workflow: ocm-ci-fastforward
5656
zz_generated_metadata:
5757
branch: main
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
base_images:
2+
base:
3+
name: ubi-minimal
4+
namespace: ocp
5+
tag: "8"
6+
cli:
7+
name: "4.13"
8+
namespace: ocp
9+
tag: cli
10+
build_root:
11+
image_stream_tag:
12+
name: release
13+
namespace: openshift
14+
tag: golang-1.21
15+
images:
16+
- dockerfile_path: Dockerfile
17+
from: base
18+
inputs:
19+
cli:
20+
as:
21+
- quay.io/openshift/origin-cli:4.13
22+
to: acm-workload
23+
promotion: {}
24+
resources:
25+
'*':
26+
limits:
27+
memory: 4Gi
28+
requests:
29+
cpu: 100m
30+
memory: 200Mi
31+
tests:
32+
- as: pr-image-mirror
33+
steps:
34+
dependencies:
35+
SOURCE_IMAGE_REF: acm-workload
36+
env:
37+
IMAGE_REPO: acm-workload
38+
REGISTRY_ORG: stolostron
39+
workflow: ocm-ci-image-mirror
40+
- as: pr-merge-image-mirror
41+
postsubmit: true
42+
steps:
43+
dependencies:
44+
SOURCE_IMAGE_REF: acm-workload
45+
env:
46+
IMAGE_REPO: acm-workload
47+
IMAGE_TAG: release-2.13
48+
REGISTRY_ORG: stolostron
49+
workflow: ocm-ci-image-mirror
50+
zz_generated_metadata:
51+
branch: release-2.13
52+
org: stolostron
53+
repo: acm-workload

ci-operator/config/stolostron/cluster-lifecycle-e2e/stolostron-cluster-lifecycle-e2e-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ images:
2424
promotion:
2525
to:
2626
- disabled: true
27-
name: "2.13"
27+
name: "2.14"
2828
namespace: stolostron
2929
releases:
3030
initial:
@@ -67,7 +67,7 @@ tests:
6767
postsubmit: true
6868
steps:
6969
env:
70-
DESTINATION_BRANCH: release-2.13
70+
DESTINATION_BRANCH: release-2.14
7171
workflow: ocm-ci-fastforward
7272
zz_generated_metadata:
7373
branch: main
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
base_images:
2+
base:
3+
name: ubi-minimal
4+
namespace: ocp
5+
tag: "8"
6+
stolostron_builder_go1.19-linux:
7+
name: builder
8+
namespace: stolostron
9+
tag: go1.19-linux
10+
binary_build_commands: make build --warn-undefined-variables
11+
build_root:
12+
image_stream_tag:
13+
name: builder
14+
namespace: stolostron
15+
tag: go1.19-linux
16+
images:
17+
- dockerfile_path: build/Dockerfile
18+
from: base
19+
inputs:
20+
stolostron_builder_go1.19-linux:
21+
as:
22+
- registry.ci.openshift.org/stolostron/builder:go1.19-linux
23+
to: cluster-lifecycle-e2e
24+
promotion:
25+
to:
26+
- name: "2.14"
27+
namespace: stolostron
28+
resources:
29+
'*':
30+
limits:
31+
memory: 4Gi
32+
requests:
33+
cpu: 100m
34+
memory: 200Mi
35+
test_binary_build_commands: make build GO_BUILD_FLAGS:='-race' --warn-undefined-variables
36+
tests:
37+
- as: pr-image-mirror
38+
steps:
39+
dependencies:
40+
SOURCE_IMAGE_REF: cluster-lifecycle-e2e
41+
env:
42+
IMAGE_REPO: cluster-lifecycle-e2e
43+
REGISTRY_ORG: stolostron
44+
workflow: ocm-ci-image-mirror
45+
- as: pr-merge-image-mirror
46+
postsubmit: true
47+
steps:
48+
dependencies:
49+
SOURCE_IMAGE_REF: cluster-lifecycle-e2e
50+
env:
51+
IMAGE_REPO: cluster-lifecycle-e2e
52+
IMAGE_TAG: latest
53+
REGISTRY_ORG: stolostron
54+
workflow: ocm-ci-image-mirror
55+
- as: publish
56+
postsubmit: true
57+
steps:
58+
dependencies:
59+
SOURCE_IMAGE_REF: cluster-lifecycle-e2e
60+
env:
61+
IMAGE_REPO: cluster-lifecycle-e2e
62+
REGISTRY_ORG: stolostron
63+
test:
64+
- as: publish
65+
commands: |-
66+
export OSCI_COMPONENT_NAME=cluster-lifecycle-e2e
67+
export OSCI_COMPONENT_VERSION=2.14
68+
export SELF="make -f /opt/build-harness/Makefile.prow"
69+
export OSCI_PUBLISH_DELAY="0"
70+
make -f /opt/build-harness/Makefile.prow osci/publish
71+
credentials:
72+
- mount_path: /etc/github
73+
name: acm-cicd-github
74+
namespace: test-credentials
75+
from: src
76+
resources:
77+
requests:
78+
cpu: 100m
79+
memory: 200Mi
80+
workflow: ocm-ci-image-mirror
81+
zz_generated_metadata:
82+
branch: release-2.14
83+
org: stolostron
84+
repo: cluster-lifecycle-e2e
Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
base_images:
2+
base:
3+
name: ubi-minimal
4+
namespace: ocp
5+
tag: "9"
6+
stolostron_builder_go1.22-linux:
7+
name: builder
8+
namespace: stolostron
9+
tag: go1.22-linux
10+
binary_build_commands: make build --warn-undefined-variables
11+
build_root:
12+
image_stream_tag:
13+
name: builder
14+
namespace: stolostron
15+
tag: go1.22-linux
16+
images:
17+
- dockerfile_path: Dockerfile
18+
from: base
19+
inputs:
20+
stolostron_builder_go1.22-linux:
21+
as:
22+
- registry.ci.openshift.org/stolostron/builder:go1.22-linux
23+
to: cluster-proxy-addon
24+
promotion:
25+
to:
26+
- name: "2.9"
27+
namespace: stolostron
28+
releases:
29+
initial:
30+
integration:
31+
name: "4.10"
32+
namespace: ocp
33+
latest:
34+
integration:
35+
include_built_images: true
36+
name: "4.10"
37+
namespace: ocp
38+
resources:
39+
'*':
40+
limits:
41+
memory: 4Gi
42+
requests:
43+
cpu: 100m
44+
memory: 200Mi
45+
test_binary_build_commands: make build GO_BUILD_FLAGS:='-race' --warn-undefined-variables
46+
tests:
47+
- as: build
48+
commands: |
49+
true
50+
container:
51+
from: bin
52+
skip_if_only_changed: ^\.tekton/|\.rhtap$|^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
53+
- as: unit
54+
commands: |
55+
make test --warn-undefined-variables
56+
container:
57+
from: test-bin
58+
skip_if_only_changed: ^\.tekton/|\.rhtap$|^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
59+
- as: e2e
60+
skip_if_only_changed: ^\.tekton/|\.rhtap$|^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
61+
steps:
62+
dependencies:
63+
COMPONENT_IMAGE_REF: cluster-proxy-addon
64+
env:
65+
CLUSTER_NAMES: none
66+
CLUSTERPOOL_GROUP_NAME: Server Foundation
67+
CLUSTERPOOL_HOST_NAMESPACE: server-foundation
68+
CLUSTERPOOL_HOST_PROW_KUBE_SECRET: ocm-sf-clusterpool
69+
CLUSTERPOOL_LIFETIME: 2h
70+
CLUSTERPOOL_LIST_INCLUSION_FILTER: prow
71+
SKIP_COMPONENT_INSTALL: "true"
72+
test:
73+
- as: test
74+
cli: latest
75+
commands: |
76+
export KUBECONFIG="${SHARED_DIR}/hub-1.kc"
77+
KUBECTL=oc
78+
export KUBECTL
79+
make test-e2e
80+
dependencies:
81+
- env: CLUSTER_PROXY_ADDON_IMAGE
82+
name: cluster-proxy-addon
83+
from: src
84+
resources:
85+
requests:
86+
cpu: 100m
87+
workflow: ocm-e2e-clusterpool
88+
- as: publish
89+
postsubmit: true
90+
steps:
91+
dependencies:
92+
SOURCE_IMAGE_REF: cluster-proxy-addon
93+
env:
94+
IMAGE_REPO: cluster-proxy-addon
95+
REGISTRY_ORG: stolostron
96+
test:
97+
- as: publish
98+
commands: |-
99+
export OSCI_PUBLISH_DELAY="0"
100+
export OSCI_PIPELINE_PRODUCT_PREFIX=backplane
101+
export OSCI_PIPELINE_REPO=backplane-pipeline
102+
export OSCI_COMPONENT_NAME="cluster-proxy-addon"
103+
export OSCI_COMPONENT_VERSION="2.9"
104+
export SELF="make -f Makefile.prow"
105+
make -f Makefile.prow osci/publish
106+
credentials:
107+
- mount_path: /etc/github
108+
name: acm-cicd-github
109+
namespace: test-credentials
110+
from: src
111+
resources:
112+
requests:
113+
cpu: 100m
114+
memory: 200Mi
115+
workflow: ocm-ci-image-mirror
116+
- as: pr-merge-image-mirror
117+
postsubmit: true
118+
steps:
119+
dependencies:
120+
SOURCE_IMAGE_REF: cluster-proxy-addon
121+
env:
122+
IMAGE_REPO: cluster-proxy-addon
123+
IMAGE_TAG: backplane-2.9
124+
REGISTRY_ORG: stolostron
125+
workflow: ocm-ci-image-mirror
126+
zz_generated_metadata:
127+
branch: backplane-2.9
128+
org: stolostron
129+
repo: cluster-proxy-addon

ci-operator/config/stolostron/cluster-proxy-addon/stolostron-cluster-proxy-addon-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ images:
2424
promotion:
2525
to:
2626
- disabled: true
27-
name: "2.8"
27+
name: "2.9"
2828
namespace: stolostron
2929
releases:
3030
initial:
@@ -135,7 +135,7 @@ tests:
135135
postsubmit: true
136136
steps:
137137
env:
138-
DESTINATION_BRANCH: backplane-2.8
138+
DESTINATION_BRANCH: backplane-2.9
139139
workflow: ocm-ci-fastforward
140140
zz_generated_metadata:
141141
branch: main

0 commit comments

Comments
 (0)