Skip to content

Commit

Permalink
fixup! fix: ARM images
Browse files Browse the repository at this point in the history
Signed-off-by: Mateus Oliveira <[email protected]>
  • Loading branch information
mateusoliveira43 committed Jul 26, 2024
1 parent 017f507 commit e35cb3b
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 99 deletions.
1 change: 1 addition & 0 deletions ci-operator/config/openshift/oadp-operator/.config.prowgen
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
multi_arch: yes
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
base_images:
go:
name: builder
namespace: konveyor
tag: "latest"
build_root:
image_stream_tag:
name: builder
Expand All @@ -11,19 +6,8 @@ build_root:
images:
- dockerfile_path: Dockerfile
to: oadp-operator
from: go
# - dockerfile_path: Dockerfile
# to: oadp-operator-arm
# build_args:
# - name: TARGETOS
# value: linux
# - name: TARGETARCH
# value: arm64
promotion:
to:
# - additional_images:
# oadp-operator: oadp-operator
# oadp-operator-arm: oadp-operator-arm
- name: oadp-operator
namespace: konveyor
resources:
Expand All @@ -34,27 +18,16 @@ resources:
cpu: 1000m
memory: 512Mi
tests:
# - as: unit-test
# steps:
# test:
# - as: unit
# commands: make test
# from: src
# resources:
# requests:
# cpu: 100m
# memory: 200Mi
- as: unit-test
# cluster: build10
commands: make test
container:
from: src
- as: unit-test-arm
# cluster: build10
commands: make test
container:
from: src
node_architecture: arm64
steps:
test:
- as: unit
commands: make test
from: src
resources:
requests:
cpu: 100m
memory: 200Mi
- as: unit-test-post
postsubmit: true
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ postsubmits:
always_run: true
branches:
- ^master$
cluster: build03
cluster: build10
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -849,12 +849,13 @@ presubmits:
branches:
- ^master$
- ^master-
cluster: build03
cluster: build10
context: ci/prow/images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-oadp-operator-master-images
Expand Down Expand Up @@ -954,58 +955,3 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )unit-test,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- ^master$
- ^master-
cluster: build03
context: ci/prow/unit-test-arm
decorate: true
decoration_config:
skip_cloning: true
labels:
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-oadp-operator-master-unit-test-arm
rerun_command: /test unit-test-arm
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
- --target=unit-test-arm
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- 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: 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
trigger: (?m)^/test( | .* )unit-test-arm,?($|\s.*)
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ postsubmits:
always_run: true
branches:
- ^oadp-1\.0$
cluster: build03
cluster: build10
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -399,12 +399,13 @@ presubmits:
branches:
- ^oadp-1\.0$
- ^oadp-1\.0-
cluster: build03
cluster: build10
context: ci/prow/images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-oadp-operator-oadp-1.0-images
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ postsubmits:
always_run: true
branches:
- ^oadp-1\.3$
cluster: build03
cluster: build10
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -793,12 +793,13 @@ presubmits:
branches:
- ^oadp-1\.3$
- ^oadp-1\.3-
cluster: build03
cluster: build10
context: ci/prow/images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-oadp-operator-oadp-1.3-images
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ postsubmits:
always_run: true
branches:
- ^oadp-1\.4$
cluster: build03
cluster: build10
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci-operator.openshift.io/is-promotion: "true"
ci.openshift.io/generator: prowgen
max_concurrency: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -849,12 +849,13 @@ presubmits:
branches:
- ^oadp-1\.4$
- ^oadp-1\.4-
cluster: build03
cluster: build10
context: ci/prow/images
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/cluster: build10
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-oadp-operator-oadp-1.4-images
Expand Down

0 comments on commit e35cb3b

Please sign in to comment.