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.

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

Makefile,.travis.yml: Remove docker image builds for s390x architecture #3710

Merged
merged 1 commit into from
Aug 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ jobs:
- make image-push-ansible

# Build and deploy s390x ansible-operator docker image
- <<: *deploy
name: Docker image for ansible-operator (s390x)
arch: s390x
script:
- make image-build-ansible
- make image-push-ansible
#- <<: *deploy
# name: Docker image for ansible-operator (s390x)
# arch: s390x
# script:
# - make image-build-ansible
# - make image-push-ansible

# Build and deploy arm64 helm-operator docker image
- <<: *deploy
Expand All @@ -210,12 +210,12 @@ jobs:
- make image-push-helm

# Build and deploy s390x helm-operator docker image
- <<: *deploy
name: Docker image for helm-operator (s390x)
arch: s390x
script:
- make image-build-helm
- make image-push-helm
#- <<: *deploy
# name: Docker image for helm-operator (s390x)
# arch: s390x
# script:
# - make image-build-helm
# - make image-push-helm

# Build and deploy arm64 scorecard-test docker image
- <<: *deploy
Expand All @@ -242,12 +242,12 @@ jobs:
- make image-push-scorecard-test

# Build and deploy s390x scorecard-test docker image
- <<: *deploy
name: Docker image for scorecard-test (s390x)
arch: s390x
script:
- make image-build-scorecard-test
- make image-push-scorecard-test
#- <<: *deploy
# name: Docker image for scorecard-test (s390x)
# arch: s390x
# script:
# - make image-build-scorecard-test
# - make image-push-scorecard-test

# Build and deploy amd64 scorecard-test-kuttl docker image
- <<: *deploy
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ HELM_IMAGE ?= $(HELM_BASE_IMAGE)
SCORECARD_TEST_IMAGE ?= $(SCORECARD_TEST_BASE_IMAGE)
SCORECARD_TEST_KUTTL_IMAGE ?= $(SCORECARD_TEST_KUTTL_BASE_IMAGE)

ANSIBLE_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
HELM_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
SCORECARD_TEST_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
SCORECARD_TEST_KUTTL_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
ANSIBLE_ARCHES:="amd64" "ppc64le" "arm64"
HELM_ARCHES:="amd64" "ppc64le" "arm64"
SCORECARD_TEST_ARCHES:="amd64" "ppc64le" "arm64"
SCORECARD_TEST_KUTTL_ARCHES:="amd64" "ppc64le" "arm64"

export CGO_ENABLED:=0
.DEFAULT_GOAL:=help
Expand Down
13 changes: 13 additions & 0 deletions changelog/fragments/rm-s390x-builds.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
entries:
- description: >
Docker images for s390x architecture are removed due to issues
with s390x machines failing to be scheduled and run in Travis CI.
kind: removal
breaking: true

migration:
header: Docker images for `s390x` are no longer created automatically
body: >
If you require an `s390x` image for a particular release, please
open an issue in the operator-sdk GitHub project, and the maintainers
will manually build and push an s390x image for supported versions
4 changes: 2 additions & 2 deletions website/content/en/docs/contribution-guidelines/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ As the Operator SDK interacts directly with the Kubernetes API, certain API feat

### Operating systems and architectures

Release binaries will be built for the `x86_64` architecture for MacOS Darwin platform and for the following GNU Linux architectures: `x86_64`, `ppc64le`, `s390x`.
Release binaries will be built for the `x86_64` architecture for MacOS Darwin platform and for the following GNU Linux architectures: `x86_64`, `ppc64le`, `arm64`, and `s390x`.

Base images for ansible-operator, helm-operator, and scorecard-test will be built for the following GNU Linux architectures: `x86_64`, `ppc64le`, `s390x`.
Base images for ansible-operator, helm-operator, and scorecard-test will be built for the following GNU Linux architectures: `x86_64`, `ppc64le`, and `arm64`.

Support for the Windows platform is not on the roadmap at this time.

Expand Down