From 31d37fdc9476e42da3420a7442b6123813e82286 Mon Sep 17 00:00:00 2001 From: Jakub Stejskal Date: Tue, 9 Jun 2026 22:45:55 +0200 Subject: [PATCH] Rename imagesDir to imagesLocation Signed-off-by: Jakub Stejskal --- .../actions/build/build-containers/action.yml | 4 +-- .../workflows/reusable-test-integrations.yml | 4 +-- .github/workflows/test-integrations.yml | 26 +++++++++---------- README.md | 4 +-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/actions/build/build-containers/action.yml b/.github/actions/build/build-containers/action.yml index 4c53752..e32eb00 100644 --- a/.github/actions/build/build-containers/action.yml +++ b/.github/actions/build/build-containers/action.yml @@ -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: @@ -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 diff --git a/.github/workflows/reusable-test-integrations.yml b/.github/workflows/reusable-test-integrations.yml index 68e28f8..f464b86 100644 --- a/.github/workflows/reusable-test-integrations.yml +++ b/.github/workflows/reusable-test-integrations.yml @@ -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 @@ -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: diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index f335935..91f1274 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -112,7 +112,7 @@ jobs: javaVersion: "17" helmChartName: "none" releaseVersion: "none" - imagesDir: "*-amd64.tar.gz" + imagesLocation: "*-amd64.tar.gz" clusterOperatorBuild: false checkTests: false @@ -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 @@ -142,7 +142,7 @@ jobs: javaVersion: "17" helmChartName: "none" releaseVersion: "6.6.6" - imagesDir: "none" + imagesLocation: "none" clusterOperatorBuild: false checkTests: true @@ -157,7 +157,7 @@ jobs: javaVersion: "17" helmChartName: "none" releaseVersion: "6.6.6" - imagesDir: "none" + imagesLocation: "none" clusterOperatorBuild: false checkTests: true @@ -172,7 +172,7 @@ jobs: javaVersion: "17" helmChartName: "none" releaseVersion: "6.6.6" - imagesDir: "none" + imagesLocation: "none" clusterOperatorBuild: false checkTests: true @@ -187,7 +187,7 @@ jobs: javaVersion: "17" helmChartName: "none" releaseVersion: "6.6.6" - imagesDir: "none" + imagesLocation: "none" clusterOperatorBuild: false checkTests: true @@ -202,7 +202,7 @@ jobs: javaVersion: "17" helmChartName: "none" releaseVersion: "6.6.6" - imagesDir: "none" + imagesLocation: "none" clusterOperatorBuild: false checkTests: true @@ -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 \ No newline at end of file diff --git a/README.md b/README.md index e665a7e..20e3be9 100644 --- a/README.md +++ b/README.md @@ -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) | @@ -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