From 7bd1d7ed13eae769749c40b92f3b7147b6c97ff7 Mon Sep 17 00:00:00 2001 From: Tibor Dancs Date: Mon, 29 Sep 2025 11:34:10 +0200 Subject: [PATCH] chore(ci): windows pipelines apply defaults if inputs from workflow_dispatch are empty Signed-off-by: Tibor Dancs --- .../workflows/ai-lab-e2e-nightly-windows.yaml | 18 ++++++++--------- .../recipe-catalog-change-template.yaml | 20 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ai-lab-e2e-nightly-windows.yaml b/.github/workflows/ai-lab-e2e-nightly-windows.yaml index 75a3a1aa1..4e8a13511 100644 --- a/.github/workflows/ai-lab-e2e-nightly-windows.yaml +++ b/.github/workflows/ai-lab-e2e-nightly-windows.yaml @@ -110,19 +110,19 @@ jobs: DEFAULT_PDE2E_IMAGE_VERSION: 'v0.0.3' DEFAULT_MAPT_PARAMS: "IMAGE=${{ vars.MAPT_IMAGE || 'quay.io/redhat-developer/mapt' }};VERSION_TAG=${{ vars.MAPT_VERSION_TAG || 'v0.9.7' }};CPUS=${{ vars.MAPT_CPUS || '4' }};MEMORY=${{ vars.MAPT_MEMORY || '32' }};EXCLUDED_REGIONS=\"${{ vars.MAPT_EXCLUDED_REGIONS || 'westindia,centralindia,southindia,australiacentral,australiacentral2,australiaeast,australiasoutheast,southafricanorth,southafricawest' }}\"" run: | - echo "NPM_TARGET=${{ github.event.inputs.npm_target || env.DEFAULT_NPM_TARGET }}" >> $GITHUB_ENV - echo "ENV_VARS=${{ github.event.inputs.env_vars || env.DEFAULT_ENV_VARS }}" >> $GITHUB_ENV - echo "PODMAN_URL=${{ github.event.inputs.podman_remote_url || env.DEFAULT_URL }}" >> $GITHUB_ENV - echo "PDE2E_IMAGE_VERSION=${{ github.event.inputs.pde2e_image_version || env.DEFAULT_PDE2E_IMAGE_VERSION }}" >> $GITHUB_ENV - echo "${{ github.event.inputs.podman_desktop_repo_args || env.DEFAULT_PODMAN_DESKTOP_REPO_ARGS }}" | awk -F ',' \ + echo "NPM_TARGET=${{ (github.event.inputs.npm_target != '' && github.event.inputs.npm_target) || env.DEFAULT_NPM_TARGET }}" >> $GITHUB_ENV + echo "ENV_VARS=${{ (github.event.inputs.env_vars != '' && github.event.inputs.env_vars) || env.DEFAULT_ENV_VARS }}" >> $GITHUB_ENV + echo "PODMAN_URL=${{ (github.event.inputs.podman_remote_url != '' && github.event.inputs.podman_remote_url) || env.DEFAULT_URL }}" >> $GITHUB_ENV + echo "PDE2E_IMAGE_VERSION=${{ (github.event.inputs.pde2e_image_version != '' && github.event.inputs.pde2e_image_version) || env.DEFAULT_PDE2E_IMAGE_VERSION }}" >> $GITHUB_ENV + echo "${{ (github.event.inputs.podman_desktop_repo_args != '' && github.event.inputs.podman_desktop_repo_args) || env.DEFAULT_PODMAN_DESKTOP_REPO_ARGS }}" | awk -F ',' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print "PD_"kv[1]"="kv[2]}}' >> $GITHUB_ENV - echo "${{ github.event.inputs.ext_tests_options || env.DEFAULT_EXT_TESTS_OPTIONS }}" | awk -F ',' \ + echo "${{ (github.event.inputs.ext_tests_options != '' && github.event.inputs.ext_tests_options) || env.DEFAULT_EXT_TESTS_OPTIONS }}" | awk -F ',' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print kv[1]"="kv[2]}}' >> $GITHUB_ENV - echo "${{ github.event.inputs.podman_options || env.DEFAULT_PODMAN_OPTIONS }}" | awk -F ',' \ + echo "${{ (github.event.inputs.podman_options != '' && github.event.inputs.podman_options) || env.DEFAULT_PODMAN_OPTIONS }}" | awk -F ',' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print "PODMAN_"kv[1]"="kv[2]}}' >> $GITHUB_ENV - echo "${{ github.event.inputs.ext_repo_options || env.DEFAULT_EXT_REPO_OPTIONS }}" | awk -F ',' \ + echo "${{ (github.event.inputs.ext_repo_options != '' && github.event.inputs.ext_repo_options) || env.DEFAULT_EXT_REPO_OPTIONS }}" | awk -F ',' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print "EXT_"kv[1]"="kv[2]}}' >> $GITHUB_ENV - echo "${{ github.event.inputs.mapt_params || env.DEFAULT_MAPT_PARAMS }}" | awk -F ';' \ + echo "${{ (github.event.inputs.mapt_params != '' && github.event.inputs.mapt_params) || env.DEFAULT_MAPT_PARAMS }}" | awk -F ';' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print "MAPT_"kv[1]"="kv[2]}}' >> $GITHUB_ENV - name: Create instance diff --git a/.github/workflows/recipe-catalog-change-template.yaml b/.github/workflows/recipe-catalog-change-template.yaml index c99b4dcf4..08eea72ac 100644 --- a/.github/workflows/recipe-catalog-change-template.yaml +++ b/.github/workflows/recipe-catalog-change-template.yaml @@ -99,22 +99,22 @@ jobs: DEFAULT_PDE2E_IMAGE_VERSION: 'v0.0.3-windows' DEFAULT_MAPT_PARAMS: "IMAGE=${{ vars.MAPT_IMAGE || 'quay.io/redhat-developer/mapt' }};VERSION_TAG=${{ vars.MAPT_VERSION_TAG || 'v0.9.7' }};CPUS=${{ vars.MAPT_CPUS || '4' }};MEMORY=${{ vars.MAPT_MEMORY || '32' }};EXCLUDED_REGIONS=\"${{ vars.MAPT_EXCLUDED_REGIONS || 'westindia,centralindia,southindia,australiacentral,australiacentral2,australiaeast,australiasoutheast,southafricanorth,southafricawest' }}\"" run: | - echo "FORK=${{ inputs.pd-fork || env.DEFAULT_FORK }}" >> $GITHUB_ENV - echo "BRANCH=${{ inputs.pd-branch || env.DEFAULT_BRANCH }}" >> $GITHUB_ENV - echo "NPM_TARGET=${{ inputs.npm-target || env.DEFAULT_NPM_TARGET }}" >> $GITHUB_ENV - echo "ENV_VARS=${{ inputs.pd-env-vars || env.DEFAULT_ENV_VARS }}" >> $GITHUB_ENV - echo "PODMAN_URL=${{ inputs.podman-download-url || env.DEFAULT_URL }}" >> $GITHUB_ENV - echo "PDE2E_IMAGE_VERSION=${{ inputs.pde2e-image-version || env.DEFAULT_PDE2E_IMAGE_VERSION }}" >> $GITHUB_ENV - if [[ -z "${{ inputs.trigger-workflow-repo-name }}" ]] && [[ -z "${{ inputs.trigger-workflow-fork }}" ]] && [[ -z "${{ inputs.trigger-workflow-branch }}" ]]; then + echo "FORK=${{ (inputs.pd-fork != '' && inputs.pd-fork) || env.DEFAULT_FORK }}" >> $GITHUB_ENV + echo "BRANCH=${{ (inputs.pd-branch != '' && inputs.pd-branch) || env.DEFAULT_BRANCH }}" >> $GITHUB_ENV + echo "NPM_TARGET=${{ (inputs.npm-target != '' && inputs.npm-target) || env.DEFAULT_NPM_TARGET }}" >> $GITHUB_ENV + echo "ENV_VARS=${{ (inputs.pd-env-vars != '' && inputs.pd-env-vars) || env.DEFAULT_ENV_VARS }}" >> $GITHUB_ENV + echo "PODMAN_URL=${{ (inputs.podman-download-url != '' && inputs.podman-download-url) || env.DEFAULT_URL }}" >> $GITHUB_ENV + echo "PDE2E_IMAGE_VERSION=${{ (inputs.pde2e-image-version != '' && inputs.pde2e-image-version) || env.DEFAULT_PDE2E_IMAGE_VERSION }}" >> $GITHUB_ENV + if [[ -n "${{ inputs.trigger-workflow-repo-name }}" ]] && [[ -n "${{ inputs.trigger-workflow-fork }}" ]] && [[ -n "${{ inputs.trigger-workflow-branch }}" ]]; then echo "DEFAULT_EXT_REPO_OPTIONS=REPO=${{ inputs.trigger-workflow-repo-name }},FORK=${{ inputs.trigger-workflow-fork }},BRANCH=${{ inputs.trigger-workflow-branch }}" >> $GITHUB_ENV fi - echo "${{ github.event.inputs.ext_tests_options || env.DEFAULT_EXT_TESTS_OPTIONS }}" | awk -F ',' \ + echo "${{ (inputs.ext_tests_options != '' && inputs.ext_tests_options) || env.DEFAULT_EXT_TESTS_OPTIONS }}" | awk -F ',' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print kv[1]"="kv[2]}}' >> $GITHUB_ENV echo "${{ env.DEFAULT_PODMAN_OPTIONS }}" | awk -F ',' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print "PODMAN_"kv[1]"="kv[2]}}' >> $GITHUB_ENV - echo "${{ inputs.podman-options || env.DEFAULT_EXT_REPO_OPTIONS }}" | awk -F ',' \ + echo "${{ (inputs.podman-options != '' && inputs.podman-options) || env.DEFAULT_EXT_REPO_OPTIONS }}" | awk -F ',' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print "EXT_"kv[1]"="kv[2]}}' >> $GITHUB_ENV - echo "${{ github.event.inputs.mapt_params || env.DEFAULT_MAPT_PARAMS }}" | awk -F ';' \ + echo "${{ (inputs.mapt_params != '' && inputs.mapt_params) || env.DEFAULT_MAPT_PARAMS }}" | awk -F ';' \ '{for (i=1; i<=NF; i++) {split($i, kv, "="); print "MAPT_"kv[1]"="kv[2]}}' >> $GITHUB_ENV - name: Create instance