Skip to content

Commit 9f6b452

Browse files
phracekphracek
authored
Add imagestream generator (#305)
* Add imagestream.yaml generator * Add generated files * Remove UBI7 from arches Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent afaf5e7 commit 9f6b452

File tree

5 files changed

+152
-104
lines changed

5 files changed

+152
-104
lines changed

‎.github/workflows/openshift-tests.yml

+16-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,24 @@ on:
33
types:
44
- created
55
jobs:
6+
check-imagestreams:
7+
runs-on: ubuntu-latest
8+
permissions:
9+
contents: read
10+
statuses: write
11+
if: |
12+
github.event.issue.pull_request
13+
&& (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]'))
14+
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
15+
steps:
16+
- uses: sclorg/ci-scripts/ocp-stream-generator@master
17+
with:
18+
ref: "refs/pull/${{ github.event.issue.number }}/head"
19+
620
openshift-tests:
7-
# This job only runs for '[test-all]' or '[test-openshift] pull request comments by owner, member
821
name: "${{ matrix.test_case }} tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
9-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-latest
23+
needs: check-imagestreams
1024
concurrency:
1125
group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
1226
cancel-in-progress: true
@@ -17,10 +31,6 @@ jobs:
1731
os_test: [ "rhel7", "rhel8", "rhel9"]
1832
test_case: [ "openshift-4" ]
1933

20-
if: |
21-
github.event.issue.pull_request
22-
&& (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]'))
23-
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
2434
steps:
2535
- uses: sclorg/tfaga-wrapper@main
2636
with:

‎imagestreams/imagestreams.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
- name: perl
3+
pretty_name: Perl
4+
sample_repo: "https://github.com/sclorg/dancer-ex.git"
5+
category: builder
6+
description: >-
7+
Build and run Perl APP_VERSION applications on DISTRO_NAME. For more information
8+
about using this builder image, including OpenShift considerations, see
9+
https://github.com/sclorg/s2i-perl-container/blob/master/APP_VERSION/README.md.
10+
imagestream_files:
11+
- filename: perl-centos.json
12+
latest: "5.32-ubi8"
13+
distros:
14+
- name: UBI 7
15+
app_versions: ["5.30"]
16+
17+
- name: UBI 8
18+
app_versions: ["5.26", "5.32"]
19+
20+
- name: UBI 9
21+
app_versions: ["5.32"]
22+
custom_tags:
23+
- name: "5.30"
24+
distro: UBI 7
25+
app_version: ["5.30"]
26+
27+
- filename: perl-rhel.json
28+
latest: "5.32-ubi8"
29+
distros:
30+
- name: UBI 7
31+
app_versions: ["5.30"]
32+
33+
- name: UBI 8
34+
app_versions: ["5.26", "5.32"]
35+
36+
- name: UBI 9
37+
app_versions: ["5.32"]
38+
custom_tags:
39+
- name: "5.30"
40+
distro: UBI 7
41+
app_version: ["5.30"]
42+
43+
- filename: perl-rhel-aarch64.json
44+
latest: "5.32-ubi8"
45+
distros:
46+
- name: UBI 8
47+
app_versions: ["5.26", "5.32"]
48+
49+
- name: UBI 9
50+
app_versions: ["5.32"]
51+
...

‎imagestreams/perl-centos.json

+30-35
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,38 @@
1010
"spec": {
1111
"tags": [
1212
{
13-
"name": "latest",
13+
"name": "5.30-ubi7",
1414
"annotations": {
15-
"openshift.io/display-name": "Perl (Latest)",
15+
"openshift.io/display-name": "Perl 5.30 (UBI 7)",
1616
"openshift.io/provider-display-name": "Red Hat, Inc.",
17-
"description": "Build and run Perl applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Perl available on OpenShift, including major version updates.",
17+
"description": "Build and run Perl 5.30 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.",
1818
"iconClass": "icon-perl",
1919
"tags": "builder,perl",
20-
"supports":"perl",
20+
"version": "5.30",
2121
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
2222
},
2323
"from": {
24-
"kind": "ImageStreamTag",
25-
"name": "5.32-ubi8"
24+
"kind": "DockerImage",
25+
"name": "registry.access.redhat.com/ubi7/perl-530:latest"
2626
},
2727
"referencePolicy": {
2828
"type": "Local"
2929
}
3030
},
3131
{
32-
"name": "5.32-ubi9",
32+
"name": "5.26-ubi8",
3333
"annotations": {
34-
"openshift.io/display-name": "Perl 5.32 (UBI 9)",
34+
"openshift.io/display-name": "Perl 5.26 (UBI 8)",
3535
"openshift.io/provider-display-name": "Red Hat, Inc.",
36-
"description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
37-
"iconClass": "icon-perl",
36+
"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26/README.md.",
37+
"iconClass": "icon-perl",
3838
"tags": "builder,perl",
39-
"supports":"perl:5.32,perl",
40-
"version": "5.32",
39+
"version": "5.26",
4140
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
4241
},
4342
"from": {
4443
"kind": "DockerImage",
45-
"name": "registry.access.redhat.com/ubi9/perl-532:latest"
44+
"name": "registry.access.redhat.com/ubi8/perl-526:latest"
4645
},
4746
"referencePolicy": {
4847
"type": "Local"
@@ -54,9 +53,8 @@
5453
"openshift.io/display-name": "Perl 5.32 (UBI 8)",
5554
"openshift.io/provider-display-name": "Red Hat, Inc.",
5655
"description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
57-
"iconClass": "icon-perl",
56+
"iconClass": "icon-perl",
5857
"tags": "builder,perl",
59-
"supports":"perl:5.32,perl",
6058
"version": "5.32",
6159
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
6260
},
@@ -69,20 +67,19 @@
6967
}
7068
},
7169
{
72-
"name": "5.30-el7",
70+
"name": "5.32-ubi9",
7371
"annotations": {
74-
"openshift.io/display-name": "Perl 5.30 (CentOS 7)",
72+
"openshift.io/display-name": "Perl 5.32 (UBI 9)",
7573
"openshift.io/provider-display-name": "Red Hat, Inc.",
76-
"description": "Build and run Perl 5.30 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.",
74+
"description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
7775
"iconClass": "icon-perl",
7876
"tags": "builder,perl",
79-
"supports":"perl:5.30,perl",
80-
"version": "5.30",
77+
"version": "5.32",
8178
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
8279
},
8380
"from": {
8481
"kind": "DockerImage",
85-
"name": "quay.io/centos7/perl-530-centos7:latest"
82+
"name": "registry.access.redhat.com/ubi9/perl-532:latest"
8683
},
8784
"referencePolicy": {
8885
"type": "Local"
@@ -91,38 +88,36 @@
9188
{
9289
"name": "5.30",
9390
"annotations": {
94-
"openshift.io/display-name": "Perl 5.30",
91+
"openshift.io/display-name": "Perl ['5.30'] (UBI 7)",
9592
"openshift.io/provider-display-name": "Red Hat, Inc.",
96-
"description": "Build and run Perl 5.30 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.",
93+
"description": "Build and run Perl ['5.30'] applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/['5.30']/README.md.",
9794
"iconClass": "icon-perl",
98-
"tags": "builder,perl,hidden",
99-
"supports":"perl:5.30,perl",
100-
"version": "5.30",
95+
"tags": "builder,perl",
96+
"version": "['5.30']",
10197
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
10298
},
10399
"from": {
104100
"kind": "DockerImage",
105-
"name": "quay.io/centos7/perl-530-centos7:latest"
101+
"name": "registry.access.redhat.com/ubi7/perl-['530']:latest"
106102
},
107103
"referencePolicy": {
108104
"type": "Local"
109105
}
110106
},
111107
{
112-
"name": "5.26-ubi8",
108+
"name": "latest",
113109
"annotations": {
114-
"openshift.io/display-name": "Perl 5.26 (UBI 8)",
110+
"openshift.io/display-name": "Perl 5.32 (Latest)",
115111
"openshift.io/provider-display-name": "Red Hat, Inc.",
116-
"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.",
117-
"iconClass": "icon-perl",
112+
"description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
113+
"iconClass": "icon-perl",
118114
"tags": "builder,perl",
119-
"supports":"perl:5.26,perl",
120-
"version": "5.26",
115+
"version": "5.32",
121116
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
122117
},
123118
"from": {
124-
"kind": "DockerImage",
125-
"name": "registry.access.redhat.com/ubi8/perl-526:latest"
119+
"kind": "ImageStreamTag",
120+
"name": "5.32-ubi8"
126121
},
127122
"referencePolicy": {
128123
"type": "Local"

‎imagestreams/perl-rhel-aarch64.json

+23-26
Original file line numberDiff line numberDiff line change
@@ -10,79 +10,76 @@
1010
"spec": {
1111
"tags": [
1212
{
13-
"name": "latest",
13+
"name": "5.26-ubi8",
1414
"annotations": {
15-
"openshift.io/display-name": "Perl (Latest)",
15+
"openshift.io/display-name": "Perl 5.26 (UBI 8)",
1616
"openshift.io/provider-display-name": "Red Hat, Inc.",
17-
"description": "Build and run Perl applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Perl available on OpenShift, including major version updates.",
17+
"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26/README.md.",
1818
"iconClass": "icon-perl",
1919
"tags": "builder,perl",
20-
"supports":"perl",
20+
"version": "5.26",
2121
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
2222
},
2323
"from": {
24-
"kind": "ImageStreamTag",
25-
"name": "5.32-ubi8"
24+
"kind": "DockerImage",
25+
"name": "registry.redhat.io/ubi8/perl-526:latest"
2626
},
2727
"referencePolicy": {
2828
"type": "Local"
2929
}
3030
},
3131
{
32-
"name": "5.32-ubi9",
32+
"name": "5.32-ubi8",
3333
"annotations": {
34-
"openshift.io/display-name": "Perl 5.32 (UBI 9)",
34+
"openshift.io/display-name": "Perl 5.32 (UBI 8)",
3535
"openshift.io/provider-display-name": "Red Hat, Inc.",
36-
"description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
37-
"iconClass": "icon-perl",
36+
"description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
37+
"iconClass": "icon-perl",
3838
"tags": "builder,perl",
39-
"supports":"perl:5.32,perl",
4039
"version": "5.32",
4140
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
4241
},
4342
"from": {
4443
"kind": "DockerImage",
45-
"name": "registry.redhat.io/ubi9/perl-532:latest"
44+
"name": "registry.redhat.io/ubi8/perl-532:latest"
4645
},
4746
"referencePolicy": {
4847
"type": "Local"
4948
}
5049
},
5150
{
52-
"name": "5.32-ubi8",
51+
"name": "5.32-ubi9",
5352
"annotations": {
54-
"openshift.io/display-name": "Perl 5.32 (UBI 8)",
53+
"openshift.io/display-name": "Perl 5.32 (UBI 9)",
5554
"openshift.io/provider-display-name": "Red Hat, Inc.",
56-
"description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
57-
"iconClass": "icon-perl",
55+
"description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.",
56+
"iconClass": "icon-perl",
5857
"tags": "builder,perl",
59-
"supports":"perl:5.32,perl",
6058
"version": "5.32",
6159
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
6260
},
6361
"from": {
6462
"kind": "DockerImage",
65-
"name": "registry.redhat.io/ubi8/perl-532:latest"
63+
"name": "registry.redhat.io/ubi9/perl-532:latest"
6664
},
6765
"referencePolicy": {
6866
"type": "Local"
6967
}
7068
},
7169
{
72-
"name": "5.26-ubi8",
70+
"name": "latest",
7371
"annotations": {
74-
"openshift.io/display-name": "Perl 5.26 (UBI 8)",
72+
"openshift.io/display-name": "Perl 5.32 (Latest)",
7573
"openshift.io/provider-display-name": "Red Hat, Inc.",
76-
"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.",
77-
"iconClass": "icon-perl",
74+
"description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
75+
"iconClass": "icon-perl",
7876
"tags": "builder,perl",
79-
"supports":"perl:5.26,perl",
80-
"version": "5.26",
77+
"version": "5.32",
8178
"sampleRepo": "https://github.com/sclorg/dancer-ex.git"
8279
},
8380
"from": {
84-
"kind": "DockerImage",
85-
"name": "registry.redhat.io/ubi8/perl-526:latest"
81+
"kind": "ImageStreamTag",
82+
"name": "5.32-ubi8"
8683
},
8784
"referencePolicy": {
8885
"type": "Local"

0 commit comments

Comments
 (0)