Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the logging view plugin CI config match its Dockerfile.ci #46011

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Make the logging view plugin CI config match its Dockerfile.ci #46011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions ci-operator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
base_images:
nginx-120:
name: nginx
go-builder-base:
name: release
namespace: openshift
tag: 1.20-ubi9
tag: rhel-9-release-golang-1.20-openshift-4.14
ubi9-minimal-base:
name: ubi-minimal
namespace: ocp
tag: "9"
web-builder-base:
name: ubi-minimal
namespace: ocp
tag: "9"
build_root:
image_stream_tag:
name: release
Expand All @@ -12,7 +20,14 @@ images:
- dockerfile_path: Dockerfile.cypress
to: plugin-test
- dockerfile_path: Dockerfile.ci
from: nginx-120
from: ubi9-minimal-base
inputs:
go-builder-base:
as:
- registry.redhat.io/ubi9/go-toolset:1.19
web-builder-base:
as:
- registry.redhat.io/ubi9/ubi-minimal
to: logging-view-plugin
promotion:
name: 5.y
Expand Down
25 changes: 20 additions & 5 deletions ...rator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
base_images:
nginx-120:
name: nginx
go-builder-base:
name: release
namespace: openshift
tag: 1.20-ubi9
tag: rhel-9-release-golang-1.20-openshift-4.14
ubi9-minimal-base:
name: ubi-minimal
namespace: ocp
tag: "9"
web-builder-base:
name: ubi-minimal
namespace: ocp
tag: "9"
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.17-openshift-4.10
tag: rhel-9-release-golang-1.20-openshift-4.14
images:
- dockerfile_path: Dockerfile.cypress
to: plugin-test
- dockerfile_path: Dockerfile.ci
from: nginx-120
from: ubi9-minimal-base
inputs:
go-builder-base:
as:
- registry.redhat.io/ubi9/go-toolset:1.19
web-builder-base:
as:
- registry.redhat.io/ubi9/ubi-minimal
to: logging-view-plugin
promotion:
name: "5.6"
Expand Down
25 changes: 20 additions & 5 deletions ...rator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
base_images:
nginx-120:
name: nginx
go-builder-base:
name: release
namespace: openshift
tag: 1.20-ubi9
tag: rhel-9-release-golang-1.20-openshift-4.14
ubi9-minimal-base:
name: ubi-minimal
namespace: ocp
tag: "9"
web-builder-base:
name: ubi-minimal
namespace: ocp
tag: "9"
build_root:
image_stream_tag:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.17-openshift-4.10
tag: rhel-9-release-golang-1.20-openshift-4.14
images:
- dockerfile_path: Dockerfile.cypress
to: plugin-test
- dockerfile_path: Dockerfile.ci
from: nginx-120
from: ubi9-minimal-base
inputs:
go-builder-base:
as:
- registry.redhat.io/ubi9/go-toolset:1.19
web-builder-base:
as:
- registry.redhat.io/ubi9/ubi-minimal
to: logging-view-plugin
promotion:
name: "5.7"
Expand Down
23 changes: 19 additions & 4 deletions ...rator/config/openshift/logging-view-plugin/openshift-logging-view-plugin-release-5.8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
base_images:
nginx-120:
name: nginx
go-builder-base:
name: release
namespace: openshift
tag: 1.20-ubi9
tag: rhel-9-release-golang-1.20-openshift-4.14
ubi9-minimal-base:
name: ubi-minimal
namespace: ocp
tag: "9"
web-builder-base:
name: ubi-minimal
namespace: ocp
tag: "9"
build_root:
image_stream_tag:
name: release
Expand All @@ -12,7 +20,14 @@ images:
- dockerfile_path: Dockerfile.cypress
to: plugin-test
- dockerfile_path: Dockerfile.ci
from: nginx-120
from: ubi9-minimal-base
inputs:
go-builder-base:
as:
- registry.redhat.io/ubi9/go-toolset:1.19
web-builder-base:
as:
- registry.redhat.io/ubi9/ubi-minimal
to: logging-view-plugin
promotion:
name: "5.8"
Expand Down