Add support for linux/s390x architecture (#384)

This commit enables platform support for the `linux/s390x` architecture in the CI pipeline. Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
open-telemetry · Sep 20, 2023 · bf8002e · bf8002e
1 parent 3d5a87e
commit bf8002e
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 6 deletions.
diff --git a/.github/workflows/ci-goreleaser.yaml b/.github/workflows/ci-goreleaser.yaml
@@ -20,16 +20,20 @@ jobs:
     strategy:
       matrix:
         GOOS: [linux, windows, darwin]
-        GOARCH: ["386", amd64, arm64, ppc64le, arm]
+        GOARCH: ["386", amd64, arm64, ppc64le, arm, s390x]
         exclude:
           - GOOS: darwin
             GOARCH: "386"
+          - GOOS: darwin
+            GOARCH: s390x
           - GOOS: windows
             GOARCH: arm64
           - GOOS: darwin
             GOARCH: arm
           - GOOS: windows
             GOARCH: arm
+          - GOOS: windows
+            GOARCH: s390x
     runs-on: ubuntu-20.04
 
     steps:
@@ -41,7 +45,7 @@ jobs:
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v3
         with:
-          platforms: arm64,ppc64le,linux/arm/v7
+          platforms: arm64,ppc64le,linux/arm/v7,s390x
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,16 +9,20 @@ jobs:
     strategy:
       matrix:
         GOOS: [linux, windows, darwin]
-        GOARCH: ["386", amd64, arm64, ppc64le, arm]
+        GOARCH: ["386", amd64, arm64, ppc64le, arm, s390x]
         exclude:
           - GOOS: darwin
             GOARCH: "386"
+          - GOOS: darwin
+            GOARCH: s390x
           - GOOS: windows
             GOARCH: arm64
           - GOOS: darwin
             GOARCH: arm
           - GOOS: windows
             GOARCH: arm
+          - GOOS: windows
+            GOARCH: s390x
     runs-on: ubuntu-20.04
 
     steps:
@@ -30,7 +34,7 @@ jobs:
 
       - uses: docker/setup-qemu-action@v3
         with:
-          platforms: arm64,ppc64le,linux/arm/v7
+          platforms: arm64,ppc64le,linux/arm/v7,s390x
 
       - uses: docker/setup-buildx-action@v3
 
@@ -98,7 +102,7 @@ jobs:
 
       - uses: docker/setup-qemu-action@v3
         with:
-          platforms: arm64,ppc64le
+          platforms: arm64,ppc64le,s390x
 
       - uses: docker/setup-buildx-action@v3
 

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -13,17 +13,22 @@ builds:
         - arm
         - arm64
         - ppc64le
+        - s390x
       goarm:
         - "7"
       ignore:
         - goos: darwin
           goarch: "386"
         - goos: darwin
           goarch: arm
+        - goos: darwin
+          goarch: s390x
         - goos: windows
           goarch: arm
         - goos: windows
           goarch: arm64
+        - goos: windows
+          goarch: s390x
       dir: distributions/otelcol/_build
       binary: otelcol
       ldflags:
@@ -44,17 +49,22 @@ builds:
         - arm
         - arm64
         - ppc64le
+        - s390x
       goarm:
         - "7"
       ignore:
         - goos: darwin
           goarch: "386"
         - goos: darwin
           goarch: arm
+        - goos: darwin
+          goarch: s390x
         - goos: windows
           goarch: arm
         - goos: windows
           goarch: arm64
+        - goos: windows
+          goarch: s390x
       dir: distributions/otelcol-contrib/_build
       binary: otelcol-contrib
       ldflags:
@@ -221,6 +231,25 @@ dockers:
         - --label=org.opencontainers.image.version={{.Version}}
         - --label=org.opencontainers.image.source={{.GitURL}}
       use: buildx
+    - goos: linux
+      goarch: s390x
+      dockerfile: distributions/otelcol/Dockerfile
+      image_templates:
+        - otel/opentelemetry-collector:{{ .Version }}-s390x
+        - otel/opentelemetry-collector:latest-s390x
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x
+      extra_files:
+        - configs/otelcol.yaml
+      build_flag_templates:
+        - --pull
+        - --platform=linux/s390x
+        - --label=org.opencontainers.image.created={{.Date}}
+        - --label=org.opencontainers.image.name={{.ProjectName}}
+        - --label=org.opencontainers.image.revision={{.FullCommit}}
+        - --label=org.opencontainers.image.version={{.Version}}
+        - --label=org.opencontainers.image.source={{.GitURL}}
+      use: buildx
     - goos: linux
       goarch: "386"
       dockerfile: distributions/otelcol-contrib/Dockerfile
@@ -317,6 +346,25 @@ dockers:
         - --label=org.opencontainers.image.version={{.Version}}
         - --label=org.opencontainers.image.source={{.GitURL}}
       use: buildx
+    - goos: linux
+      goarch: s390x
+      dockerfile: distributions/otelcol-contrib/Dockerfile
+      image_templates:
+        - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
+        - otel/opentelemetry-collector-contrib:latest-s390x
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
+      extra_files:
+        - configs/otelcol-contrib.yaml
+      build_flag_templates:
+        - --pull
+        - --platform=linux/s390x
+        - --label=org.opencontainers.image.created={{.Date}}
+        - --label=org.opencontainers.image.name={{.ProjectName}}
+        - --label=org.opencontainers.image.revision={{.FullCommit}}
+        - --label=org.opencontainers.image.version={{.Version}}
+        - --label=org.opencontainers.image.source={{.GitURL}}
+      use: buildx
 docker_manifests:
     - name_template: otel/opentelemetry-collector:{{ .Version }}
       image_templates:
@@ -325,52 +373,60 @@ docker_manifests:
         - otel/opentelemetry-collector:{{ .Version }}-armv7
         - otel/opentelemetry-collector:{{ .Version }}-arm64
         - otel/opentelemetry-collector:{{ .Version }}-ppc64le
+        - otel/opentelemetry-collector:{{ .Version }}-s390x
     - name_template: otel/opentelemetry-collector:latest
       image_templates:
         - otel/opentelemetry-collector:latest-386
         - otel/opentelemetry-collector:latest-amd64
         - otel/opentelemetry-collector:latest-armv7
         - otel/opentelemetry-collector:latest-arm64
         - otel/opentelemetry-collector:latest-ppc64le
+        - otel/opentelemetry-collector:latest-s390x
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-amd64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x
     - name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
       image_templates:
         - otel/opentelemetry-collector-contrib:{{ .Version }}-386
         - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
         - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
         - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
         - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+        - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
     - name_template: otel/opentelemetry-collector-contrib:latest
       image_templates:
         - otel/opentelemetry-collector-contrib:latest-386
         - otel/opentelemetry-collector-contrib:latest-amd64
         - otel/opentelemetry-collector-contrib:latest-armv7
         - otel/opentelemetry-collector-contrib:latest-arm64
         - otel/opentelemetry-collector-contrib:latest-ppc64le
+        - otel/opentelemetry-collector-contrib:latest-s390x
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
     - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
       image_templates:
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
         - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
+        - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -32,7 +32,7 @@ const ArmArch = "arm"
 
 var (
 	ImagePrefixes = []string{"otel", "ghcr.io/open-telemetry/opentelemetry-collector-releases"}
-	Architectures = []string{"386", "amd64", "arm", "arm64", "ppc64le"}
+	Architectures = []string{"386", "amd64", "arm", "arm64", "ppc64le", "s390x"}
 	ArmVersions   = []string{"7"}
 )
 
@@ -76,8 +76,10 @@ func Build(dist string) config.Build {
 		Ignore: []config.IgnoredBuild{
 			{Goos: "darwin", Goarch: "386"},
 			{Goos: "darwin", Goarch: "arm"},
+			{Goos: "darwin", Goarch: "s390x"},
 			{Goos: "windows", Goarch: "arm"},
 			{Goos: "windows", Goarch: "arm64"},
+			{Goos: "windows", Goarch: "s390x"},
 		},
 	}
 }