Skip to content
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
4 changes: 2 additions & 2 deletions .github/actions/build/build-containers/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ inputs:
description: "Container image tag"
required: false
default: "latest"
imagesDir:
imagesLocation:
description: "Path to directory with images tar balls"
required: true
artifactSuffix:
Expand Down Expand Up @@ -64,7 +64,7 @@ runs:

- name: Create tarball with images
shell: bash
run: "tar -cvpf containers-${{ inputs.artifactSuffix }}-${{ inputs.architecture }}.tar ${{ inputs.imagesDir }}"
run: "tar -cvpf containers-${{ inputs.artifactSuffix }}-${{ inputs.architecture }}.tar ${{ inputs.imagesLocation }}"

- name: Upload containers artifact
uses: actions/upload-artifact@v7
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-test-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ on:
description: "Release version like 1.5.0"
required: true
type: string
imagesDir:
imagesLocation:
description: "Directory/file that will be used as source for containers tar ball"
required: true
type: string
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
- name: Build containers using build-containers action
uses: ./.github/actions/build/build-containers
with:
imagesDir: ${{ inputs.imagesDir }}
imagesLocation: ${{ inputs.imagesLocation }}
artifactSuffix: "${{ inputs.artifactSuffix }}"

test-push-containers:
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/test-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
javaVersion: "21"
helmChartName: "strimzi-kafka-operator-helm-3-chart"
releaseVersion: "6.6.6"
imagesDir: "./docker-images/container-archives"
imagesLocation: "./docker-images/container-archives"
clusterOperatorBuild: true
checkTests: false

Expand All @@ -52,7 +52,7 @@ jobs:
javaVersion: "21"
helmChartName: "none"
releaseVersion: "6.6.6-rc1"
imagesDir: "kafka-bridge-amd64.tar.gz"
imagesLocation: "kafka-bridge-amd64.tar.gz"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -67,7 +67,7 @@ jobs:
javaVersion: "21"
helmChartName: "strimzi-access-operator-helm-3-chart"
releaseVersion: "6.6.6"
imagesDir: "access-operator-container-amd64.tar.gz"
imagesLocation: "access-operator-container-amd64.tar.gz"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -82,7 +82,7 @@ jobs:
javaVersion: "21"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "mqtt-bridge-amd64.tar.gz"
imagesLocation: "mqtt-bridge-amd64.tar.gz"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -97,7 +97,7 @@ jobs:
javaVersion: "21"
helmChartName: "strimzi-drain-cleaner-helm-3-chart"
releaseVersion: "6.6.6"
imagesDir: "drain-cleaner-container-amd64.tar.gz"
imagesLocation: "drain-cleaner-container-amd64.tar.gz"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -112,7 +112,7 @@ jobs:
javaVersion: "17"
helmChartName: "none"
releaseVersion: "none"
imagesDir: "*-amd64.tar.gz"
imagesLocation: "*-amd64.tar.gz"
clusterOperatorBuild: false
checkTests: false

Expand All @@ -127,7 +127,7 @@ jobs:
javaVersion: "21"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "./docker-images/container-archives"
imagesLocation: "./docker-images/container-archives"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -142,7 +142,7 @@ jobs:
javaVersion: "17"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "none"
imagesLocation: "none"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -157,7 +157,7 @@ jobs:
javaVersion: "17"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "none"
imagesLocation: "none"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -172,7 +172,7 @@ jobs:
javaVersion: "17"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "none"
imagesLocation: "none"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -187,7 +187,7 @@ jobs:
javaVersion: "17"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "none"
imagesLocation: "none"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -202,7 +202,7 @@ jobs:
javaVersion: "17"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "none"
imagesLocation: "none"
clusterOperatorBuild: false
checkTests: true

Expand All @@ -218,7 +218,7 @@ jobs:
javaVersion: ${{ matrix.project.javaVersion }}
helmChartName: ${{ matrix.project.helmChartName }}
releaseVersion: ${{ matrix.project.releaseVersion }}
imagesDir: ${{ matrix.project.imagesDir }}
imagesLocation: ${{ matrix.project.imagesLocation }}
clusterOperatorBuild: ${{ matrix.project.clusterOperatorBuild }}
checkTests: ${{ matrix.project.checkTests }}
secrets: inherit
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Actions for building, testing, and releasing Strimzi components.
| Action | Description | Key Inputs |
|----------------------------|----------------------------------------------------------|--------------------------------------------------------------------------------------|
| `build/build-binaries` | Builds and tests Java binaries using Makefile targets | `clusterOperatorBuild` (false), `mainBuild` (true), `artifactSuffix` (binaries) |
| `build/build-containers` | Builds and archives container images | `architecture` (amd64), `imagesDir` (required), `containerTag` (latest) |
| `build/build-containers` | Builds and archives container images | `architecture` (amd64), `imagesLocation` (required), `containerTag` (latest) |
| `build/push-containers` | Pushes container images and creates multi-arch manifests | `architectures` (required), `registryUser` (required), `registryPassword` (required) |
| `build/load-containers` | Loads container images into Kind/Minikube registry | `registry` (required: minikube/kind/external) |
| `build/deploy-java` | Deploys Java artifacts to Maven Central | `projects` (required), `settingsPath` (required) |
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
javaVersion: "17"
helmChartName: "none"
releaseVersion: "6.6.6"
imagesDir: "kafka-bridge-amd64.tar.gz"
imagesLocation: "kafka-bridge-amd64.tar.gz"
clusterOperatorBuild: false
githubActionsRef: "1.0.0"
secrets: inherit
Expand Down
Loading