From 95e64ba7811d99fbdba480e40ada53edfa86c6ef Mon Sep 17 00:00:00 2001 From: "tompage1994@hotmail.co.uk" Date: Thu, 23 May 2024 12:11:22 +0100 Subject: [PATCH 1/5] Set release CI tests --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c643eeed7..85006ce7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,8 @@ jobs: matrix: awx_version: - devel - - 23.3.1 - - 23.3.0 - - 23.0.0 + - 24.2.0 + - 23.9.0 - 22.7.0 uses: "./.github/workflows/ci_standalone_versioned.yml" with: From 12f96a3327ea5afd15e49e5349eaee770a85d98d Mon Sep 17 00:00:00 2001 From: "tompage1994@hotmail.co.uk" Date: Thu, 23 May 2024 14:35:41 +0100 Subject: [PATCH 2/5] pin requests version --- .github/workflows/ci_standalone_versioned.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_standalone_versioned.yml b/.github/workflows/ci_standalone_versioned.yml index bc59f6059..8dd729d05 100644 --- a/.github/workflows/ci_standalone_versioned.yml +++ b/.github/workflows/ci_standalone_versioned.yml @@ -44,7 +44,7 @@ jobs: run: sudo apt-get install -y libsasl2-dev python3-dev libldap2-dev libssl-dev build-essential - name: Install docker-compose - run: pip3 install --upgrade docker-compose docker==6.1.3 pyyaml==5.3.1 + run: pip3 install --upgrade docker-compose docker==6.1.3 pyyaml==5.3.1 requests==2.31.0 - name: collect system info run: whoami; id; pwd; ls -al; uname -a ; df -h .; mount ; cat /etc/issue; docker --version ; ps aux | fgrep -i docker; ls -al /var/run/containerd/containerd.sock From 037c68ff5a9be9a1cd6b4a670f212bbd1f16cced Mon Sep 17 00:00:00 2001 From: "tompage1994@hotmail.co.uk" Date: Thu, 23 May 2024 15:21:29 +0100 Subject: [PATCH 3/5] Don't update the project in CI --- tests/configs/projects.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/configs/projects.yml b/tests/configs/projects.yml index 287c551b2..5f51adae7 100644 --- a/tests/configs/projects.yml +++ b/tests/configs/projects.yml @@ -10,7 +10,7 @@ controller_projects: description: Test Project 1 organization: Default wait: true - update_project: true + update_project: false - name: Demo Project scm_type: git scm_url: https://github.com/ansible/tower-example.git @@ -19,17 +19,19 @@ controller_projects: description: Test Project 1 organization: Default wait: true - update_project: true + update_project: false - name: Test Project 2 scm_type: git scm_url: https://github.com/ansible/ansible-examples.git description: Test Project 2 organization: Default + update_project: false - name: Test Inventory source project scm_type: git scm_url: https://github.com/ansible/ansible-examples.git description: ansible-examples organization: Satellite + update_project: false - name: Test Inventory source project with credential scm_type: git scm_url: https://github.com/ansible/ansible-examples.git From 5c0c9d16f744ed3da9801e0f13e84b1136cf26b8 Mon Sep 17 00:00:00 2001 From: "tompage1994@hotmail.co.uk" Date: Thu, 23 May 2024 16:03:04 +0100 Subject: [PATCH 4/5] Don't wait for update --- tests/configs/projects.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/configs/projects.yml b/tests/configs/projects.yml index 5f51adae7..9369f1d08 100644 --- a/tests/configs/projects.yml +++ b/tests/configs/projects.yml @@ -9,7 +9,7 @@ controller_projects: scm_clean: true description: Test Project 1 organization: Default - wait: true + wait: false update_project: false - name: Demo Project scm_type: git @@ -18,19 +18,21 @@ controller_projects: scm_clean: true description: Test Project 1 organization: Default - wait: true + wait: false update_project: false - name: Test Project 2 scm_type: git scm_url: https://github.com/ansible/ansible-examples.git description: Test Project 2 organization: Default + wait: false update_project: false - name: Test Inventory source project scm_type: git scm_url: https://github.com/ansible/ansible-examples.git description: ansible-examples organization: Satellite + wait: false update_project: false - name: Test Inventory source project with credential scm_type: git From 89dd6a44b991312ffa365e5cbefee7ffc7121d7e Mon Sep 17 00:00:00 2001 From: "tompage1994@hotmail.co.uk" Date: Thu, 23 May 2024 16:26:23 +0100 Subject: [PATCH 5/5] dont wait for inv src --- tests/configs/inventory_sources.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/configs/inventory_sources.yml b/tests/configs/inventory_sources.yml index cf0dbf448..cdc89f3fc 100644 --- a/tests/configs/inventory_sources.yml +++ b/tests/configs/inventory_sources.yml @@ -12,7 +12,7 @@ controller_inventory_sources: overwrite: true update_on_launch: true update_cache_timeout: 0 - wait: true + wait: false - name: RHVM-02 source: scm source_project: Test Project 2 @@ -23,7 +23,7 @@ controller_inventory_sources: overwrite: true update_on_launch: true update_cache_timeout: 0 - wait: true + wait: false - name: RHVM-01-Default source: scm source_project: Test Project 2 @@ -34,7 +34,7 @@ controller_inventory_sources: overwrite: true update_on_launch: true update_cache_timeout: 0 - wait: true + wait: false - name: RHVM-02 inventory: RHVM-01 organization: Satellite