fixes

newrelic · Feb 5, 2024 · 3b6ea17 · 3b6ea17
1 parent dd04892
commit 3b6ea17
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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