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

CNTRLPLANE-26: Disable building HO for s390x platform on PR #5314

Merged
merged 1 commit into from
Dec 19, 2024
Merged

CNTRLPLANE-26: Disable building HO for s390x platform on PR #5314

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
78 changes: 0 additions & 78 deletions .tekton/hypershift-operator-main-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,34 +206,6 @@ spec:
workspace: workspace-arm64
- name: basic-auth
workspace: git-auth
- name: clone-repository-s390x
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just comment everything out rather than removing it? That way we can just uncomment it back in once s390x is supported again.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally I'm not a big fan of commenting out code. Git history is always there and one can see whatever was removed. But sure, if that's what folks want.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As agreed, a JIRA issue is now referenced

params:
- name: url
value: $(params.git-url)
- name: revision
value: $(params.revision)
runAfter:
- init
taskRef:
kind: Task
params:
- name: name
value: git-clone
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-git-clone:0.1@sha256:a3e22f57fbf8398fbe93fbeeb38e03756cd073182d6d109fe8e8cde57b561603
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
workspaces:
- name: output
workspace: workspace-s390x
- name: basic-auth
workspace: git-auth
- name: clone-repository-ppc64le
params:
- name: url
Expand Down Expand Up @@ -357,43 +329,6 @@ spec:
workspaces:
- name: source
workspace: workspace-arm64
- name: build-container-s390x
params:
- name: IMAGE
value: $(params.output-image)-s390x
- name: DOCKERFILE
value: $(params.dockerfile)
- name: CONTEXT
value: $(params.path-context)
- name: HERMETIC
value: $(params.hermetic)
- name: PREFETCH_INPUT
value: $(params.prefetch-input)
- name: IMAGE_EXPIRES_AFTER
value: $(params.image-expires-after)
- name: COMMIT_SHA
value: $(tasks.clone-repository.results.commit)
- name: PLATFORM
value: linux/s390x
runAfter:
- clone-repository-s390x
taskRef:
params:
- name: name
value: buildah-remote
- name: bundle
value: quay.io/redhat-appstudio-tekton-catalog/task-buildah-remote:0.2@sha256:27d07dbe1d3b6b612cd0a68eb4974791e9a91af2df98c43b9810b5b9f7ca573c
- name: kind
value: task
resolver: bundles
when:
- input: $(tasks.init.results.build)
operator: in
values:
- "true"
workspaces:
- name: source
workspace: workspace-s390x

- name: build-container-ppc64le
params:
Expand Down Expand Up @@ -442,12 +377,10 @@ spec:
value:
- $(tasks.build-container-amd64.results.IMAGE_URL)@$(tasks.build-container-amd64.results.IMAGE_DIGEST)
- $(tasks.build-container-arm64.results.IMAGE_URL)@$(tasks.build-container-arm64.results.IMAGE_DIGEST)
- $(tasks.build-container-s390x.results.IMAGE_URL)@$(tasks.build-container-s390x.results.IMAGE_DIGEST)
- $(tasks.build-container-ppc64le.results.IMAGE_URL)@$(tasks.build-container-ppc64le.results.IMAGE_DIGEST)
runAfter:
- build-container-amd64
- build-container-arm64
- build-container-s390x
- build-container-ppc64le
taskRef:
params:
Expand Down Expand Up @@ -601,17 +534,6 @@ spec:
requests:
storage: 1Gi
status: {}
- name: workspace-s390x
volumeClaimTemplate:
metadata:
creationTimestamp: null
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 1Gi
status: {}
- name: workspace-ppc64le
volumeClaimTemplate:
metadata:
Expand Down