Skip to content

Commit

Permalink
MGMT-17897: Build and publish assisted-service-el8 image (#52320)
Browse files Browse the repository at this point in the history
* Build and publish assisted-service-el8 image

This image is required for assisted-service to be able to install
clusters of version <4.16 in FIPS environments.

Resolves https://issues.redhat.com/browse/MGMT-17897

* Use a build arg rather than a separate Dockerfile for the el8 image
  • Loading branch information
carbonin authored May 28, 2024
1 parent d48748d commit 1398c57
Show file tree
Hide file tree
Showing 3 changed files with 147 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ images:
as:
- registry.ci.openshift.org/openshift/release:golang-1.20
to: assisted-service
- build_args:
- name: BASE_TAG
value: stream8
dockerfile_path: Dockerfile.assisted-service
inputs:
openshift_release_golang-1.20:
as:
- registry.ci.openshift.org/openshift/release:golang-1.20
to: assisted-service-el8
- dockerfile_literal: |
FROM coreos/centos
COPY . .
Expand Down Expand Up @@ -167,13 +176,31 @@ tests:
SOURCE_IMAGE_REF: assisted-service
test:
- ref: assisted-baremetal-images-publish
- as: mirror-nightly-image-el8
cron: '@daily'
steps:
dependencies:
SOURCE_IMAGE_REF: assisted-service-el8
env:
IMAGE_REPO: assisted-service-el8
test:
- ref: assisted-baremetal-images-publish
- as: mirror-vcsref-image
postsubmit: true
steps:
dependencies:
SOURCE_IMAGE_REF: assisted-service
test:
- ref: assisted-baremetal-images-publish
- as: mirror-vcsref-image-el8
postsubmit: true
steps:
dependencies:
SOURCE_IMAGE_REF: assisted-service-el8
env:
IMAGE_REPO: assisted-service-el8
test:
- ref: assisted-baremetal-images-publish
- as: operator-publish
postsubmit: true
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -850,6 +850,67 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build04
cron: 24 22 * * *
decorate: true
extra_refs:
- base_ref: master
org: openshift
repo: assisted-service
labels:
ci-operator.openshift.io/variant: edge
ci.openshift.io/generator: prowgen
job-release: "4.16"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-assisted-service-master-edge-mirror-nightly-image-el8
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=mirror-nightly-image-el8
- --variant=edge
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build04
cron: 00 00 */1 * 0-5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,65 @@ postsubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
always_run: true
branches:
- ^master$
cluster: build04
decorate: true
labels:
ci-operator.openshift.io/variant: edge
ci.openshift.io/generator: prowgen
job-release: "4.16"
max_concurrency: 1
name: branch-ci-openshift-assisted-service-master-edge-mirror-vcsref-image-el8
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=mirror-vcsref-image-el8
- --variant=edge
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
always_run: true
branches:
Expand Down

0 comments on commit 1398c57

Please sign in to comment.