update else on lists and tests (redhat-cop#614)

przemkalit · Jun 9, 2023 · dd2fac6 · dd2fac6
1 parent ef940c1
commit dd2fac6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/ci_standalone.yml b/.github/workflows/ci_standalone.yml
@@ -19,11 +19,11 @@ jobs:
       matrix:
         awx_version:
           - devel
+          - 22.3.0
+          - 22.2.0
           - 22.1.0
           - 22.0.0
           - 21.14.0
-          - 21.13.0
-          - 21.12.0
           - 21.11.0
     uses: "./.github/workflows/ci_standalone_versioned.yml"
     with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,10 +15,11 @@ jobs:
       matrix:
         awx_version:
           - devel
+          - 22.3.0
+          - 22.2.0
+          - 22.1.0
           - 22.0.0
           - 21.14.0
-          - 21.13.0
-          - 21.12.0
           - 21.11.0
     uses: "./.github/workflows/ci_standalone_versioned.yml"
     with:

diff --git a/tests/configs/schedule.yml b/tests/configs/schedule.yml
@@ -10,6 +10,7 @@ controller_schedules:
     rrule: "DTSTART:20200101T000000Z RRULE:FREQ=HOURLY;INTERVAL=3"
     execution_environment: My EE
     forks: 2
+    limit: all
     instance_groups:
       - test_instance_group
     labels:

diff --git a/tests/configs/templates.yml b/tests/configs/templates.yml
@@ -40,6 +40,7 @@ controller_templates:
     ask_job_slice_count_on_launch: true
     ask_labels_on_launch: true
     ask_timeout_on_launch: true
+    ask_limit_on_launch: true
     prevent_instance_group_fallback: true
     survey_spec:
       name: ''

diff --git a/tests/configs_export_model/differential_items.yml b/tests/configs_export_model/differential_items.yml
@@ -111,7 +111,7 @@ differential_expected:
       ask_job_slice_count_on_launch: true
       ask_job_type_on_launch: false
       ask_labels_on_launch: true
-      ask_limit_on_launch: false
+      ask_limit_on_launch: true
       ask_scm_branch_on_launch: false
       ask_skip_tags_on_launch: false
       ask_tags_on_launch: false
@@ -184,7 +184,7 @@ differential_expected:
             job_slice_count: 1
             job_tags: ""
             job_type:
-            limit: ""
+            limit: all
             name: Demo Schedule 2
             natural_key:
               name: Demo Schedule 2
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,11 +19,11 @@ jobs: @@
           matrix:
             awx_version:
               - devel
+              - 22.3.0
+              - 22.2.0
               - 22.1.0
               - 22.0.0
               - 21.14.0
-              - 21.13.0
-              - 21.12.0
               - 21.11.0
         uses: "./.github/workflows/ci_standalone_versioned.yml"
         with:
@@ Expand Down @@