From 3b6ea17d7d4da595b4b91257120a578eae92bf13 Mon Sep 17 00:00:00 2001 From: Ruben Ruiz de Gauna Date: Mon, 5 Feb 2024 11:47:48 +0100 Subject: [PATCH] fixes --- .github/workflows/canaries_prune.yml | 7 ++++--- .github/workflows/component_canaries_prune.yml | 4 ++-- test/canaries/deploy_canaries.yml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/canaries_prune.yml b/.github/workflows/canaries_prune.yml index 9c1f8e7cb..2b9c17e0d 100644 --- a/.github/workflows/canaries_prune.yml +++ b/.github/workflows/canaries_prune.yml @@ -8,12 +8,13 @@ on: type: choice default: '' options: - - '' - - linux - - windows + - 'all' + - 'linux' + - 'windows' required: false tag: description: 'Tag to prune' + type: string required: true permissions: diff --git a/.github/workflows/component_canaries_prune.yml b/.github/workflows/component_canaries_prune.yml index ef5171a9b..014d4cb36 100644 --- a/.github/workflows/component_canaries_prune.yml +++ b/.github/workflows/component_canaries_prune.yml @@ -24,7 +24,7 @@ permissions: jobs: canaries-prune-linux: - if: ${{ inputs.PLATFORM == 'linux' || inputs.PLATFORM == '' }} + if: ${{ inputs.PLATFORM == 'linux' || inputs.PLATFORM == 'all' }} runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 @@ -68,7 +68,7 @@ jobs: ok=\d+\s+changed=\d+\s+unreachable=\d+\s+failed=\d+\s+skipped=\d+\s+rescued=\d+\s+ignored=\d+ canaries-prune-windows: - if: ${{ inputs.PLATFORM == 'windows' || inputs.PLATFORM == '' }} + if: ${{ inputs.PLATFORM == 'windows' || inputs.PLATFORM == 'all' }} runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/test/canaries/deploy_canaries.yml b/test/canaries/deploy_canaries.yml index a849d60f6..8f896123e 100644 --- a/test/canaries/deploy_canaries.yml +++ b/test/canaries/deploy_canaries.yml @@ -29,7 +29,7 @@ name: caos.ansible_roles.infra_agent vars: is_containerized: true - target_version: "{{ current_version }}" + target_version: "{{ current_version }}-rc" display_name: "{{ inventory_hostname }}-current" - name: install previous agent in container