Skip to content

Commit 646fa8b

Browse files
authored
Makefile,.travis.yml: Remove docker image builds for s390x architecture (#3710)
Travis CI builds for s390x are failing. If left in the build, we will be unable to complete a release. Therefore, until further notice, no s390x images will be built as part of the release automation. If necessary, we can manually build and push s390x images on a case-by-case basis.
1 parent ccd621b commit 646fa8b

File tree

4 files changed

+37
-24
lines changed

4 files changed

+37
-24
lines changed

.travis.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@ jobs:
178178
- make image-push-ansible
179179

180180
# Build and deploy s390x ansible-operator docker image
181-
- <<: *deploy
182-
name: Docker image for ansible-operator (s390x)
183-
arch: s390x
184-
script:
185-
- make image-build-ansible
186-
- make image-push-ansible
181+
#- <<: *deploy
182+
# name: Docker image for ansible-operator (s390x)
183+
# arch: s390x
184+
# script:
185+
# - make image-build-ansible
186+
# - make image-push-ansible
187187

188188
# Build and deploy arm64 helm-operator docker image
189189
- <<: *deploy
@@ -210,12 +210,12 @@ jobs:
210210
- make image-push-helm
211211

212212
# Build and deploy s390x helm-operator docker image
213-
- <<: *deploy
214-
name: Docker image for helm-operator (s390x)
215-
arch: s390x
216-
script:
217-
- make image-build-helm
218-
- make image-push-helm
213+
#- <<: *deploy
214+
# name: Docker image for helm-operator (s390x)
215+
# arch: s390x
216+
# script:
217+
# - make image-build-helm
218+
# - make image-push-helm
219219

220220
# Build and deploy arm64 scorecard-test docker image
221221
- <<: *deploy
@@ -242,12 +242,12 @@ jobs:
242242
- make image-push-scorecard-test
243243

244244
# Build and deploy s390x scorecard-test docker image
245-
- <<: *deploy
246-
name: Docker image for scorecard-test (s390x)
247-
arch: s390x
248-
script:
249-
- make image-build-scorecard-test
250-
- make image-push-scorecard-test
245+
#- <<: *deploy
246+
# name: Docker image for scorecard-test (s390x)
247+
# arch: s390x
248+
# script:
249+
# - make image-build-scorecard-test
250+
# - make image-push-scorecard-test
251251

252252
# Build and deploy amd64 scorecard-test-kuttl docker image
253253
- <<: *deploy

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ HELM_IMAGE ?= $(HELM_BASE_IMAGE)
3737
SCORECARD_TEST_IMAGE ?= $(SCORECARD_TEST_BASE_IMAGE)
3838
SCORECARD_TEST_KUTTL_IMAGE ?= $(SCORECARD_TEST_KUTTL_BASE_IMAGE)
3939

40-
ANSIBLE_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
41-
HELM_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
42-
SCORECARD_TEST_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
43-
SCORECARD_TEST_KUTTL_ARCHES:="amd64" "ppc64le" "s390x" "arm64"
40+
ANSIBLE_ARCHES:="amd64" "ppc64le" "arm64"
41+
HELM_ARCHES:="amd64" "ppc64le" "arm64"
42+
SCORECARD_TEST_ARCHES:="amd64" "ppc64le" "arm64"
43+
SCORECARD_TEST_KUTTL_ARCHES:="amd64" "ppc64le" "arm64"
4444

4545
export CGO_ENABLED:=0
4646
.DEFAULT_GOAL:=help
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
entries:
2+
- description: >
3+
Docker images for s390x architecture are removed due to issues
4+
with s390x machines failing to be scheduled and run in Travis CI.
5+
kind: removal
6+
breaking: true
7+
8+
migration:
9+
header: Docker images for `s390x` are no longer created automatically
10+
body: >
11+
If you require an `s390x` image for a particular release, please
12+
open an issue in the operator-sdk GitHub project, and the maintainers
13+
will manually build and push an s390x image for supported versions

website/content/en/docs/contribution-guidelines/release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ As the Operator SDK interacts directly with the Kubernetes API, certain API feat
2626

2727
### Operating systems and architectures
2828

29-
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`.
29+
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`.
3030

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

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

0 commit comments

Comments
 (0)