Merge pull request #3557 from uselagoon/testing/ansible-core

Update ansible used in tests

tests/Dockerfile

@@ -1,6 +1,6 @@
 ARG UPSTREAM_REPO
 ARG UPSTREAM_TAG
-FROM ${UPSTREAM_REPO:-uselagoon}/python-3.10:${UPSTREAM_TAG:-latest}
+FROM ${UPSTREAM_REPO:-uselagoon}/python-3.11:${UPSTREAM_TAG:-latest}
 
 RUN apk add --no-cache \
       bash \
@@ -24,7 +24,7 @@ RUN apk add --no-cache --virtual .build-deps \
     && pip3 install -r requirements.txt \
     && apk del .build-deps
 
-RUN ansible-galaxy collection install ansible.posix community.general kubernetes.core
+RUN ansible-galaxy collection install -vvv ansible.posix community.general kubernetes.core
 
 # download, extract and install kubectl binary
 ENV KUBECTL_VER=v1.25.5

tests/ansible.cfg

@@ -5,7 +5,4 @@ host_key_checking = False
 deprecation_warnings = False
 interpreter_python = auto_silent
 callback_whitelist = profile_tasks
-
-[galaxy]
-server = https://old-galaxy.ansible.com/
-;server = https://galaxy.ansible.com/
+callbacks_enabled=ansible.posix.profile_tasks

tests/checks/check-branch-sha.yaml

@@ -5,7 +5,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_SHA={{ expected_head }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the branch name"
   hosts: localhost
@@ -14,7 +14,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_BRANCH={{ expected_branch }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
     when: expected_branch != ""
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the hash inside an environment variable set during buildtime"
@@ -24,7 +24,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_SHA_BUILDTIME={{ expected_head }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the branch name inside an environment variable set during buildtime"
   hosts: localhost
@@ -33,4 +33,4 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_BRANCH_BUILDTIME={{ expected_branch_buildtime | default(expected_branch)  }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml

tests/checks/check-deployed.yaml

@@ -5,7 +5,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_SHA={{ expected_head }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the branch name"
   hosts: localhost
@@ -14,7 +14,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_BRANCH={{ expected_branch }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the hash inside an environment variable set during buildtime"
   hosts: localhost
@@ -23,7 +23,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_SHA_BUILDTIME={{ expected_head }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the branch name inside an environment variable set during buildtime"
   hosts: localhost
@@ -32,7 +32,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_GIT_BRANCH_BUILDTIME={{ expected_branch }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the env variable set by .env file"
   hosts: localhost
@@ -41,7 +41,7 @@
     url: "{{ url }}"
     expected_content: "VARIABLE_SET_BY_DOTENV=true"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for the env variable set by .env.defaults file"
   hosts: localhost
@@ -50,4 +50,4 @@
     url: "{{ url }}"
     expected_content: "VARIABLE_SET_BY_DOTENV_DEFAULTS=true"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml

tests/checks/check-pullrequest.yaml

@@ -5,7 +5,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_BUILD_TYPE_BUILDTIME={{ expected_build_type }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_HEAD_BRANCH_BUILDTIME={{ expected_pr_head_branch }}"
   hosts: localhost
@@ -14,7 +14,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_HEAD_BRANCH_BUILDTIME={{ expected_pr_head_branch }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_HEAD_BRANCH={{ expected_pr_head_branch }}"
   hosts: localhost
@@ -23,7 +23,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_HEAD_BRANCH={{ expected_pr_head_branch }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_HEAD_SHA_BUILDTIME={{ expected_pr_head_sha }}"
   hosts: localhost
@@ -32,7 +32,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_HEAD_SHA_BUILDTIME={{ expected_pr_head_sha }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_BASE_BRANCH_BUILDTIME={{ expected_pr_base_branch }}"
   hosts: localhost
@@ -41,7 +41,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_BASE_BRANCH_BUILDTIME={{ expected_pr_base_branch }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_BASE_BRANCH={{ expected_pr_base_branch }}"
   hosts: localhost
@@ -50,7 +50,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_BASE_BRANCH={{ expected_pr_base_branch }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_BASE_SHA_BUILDTIME={{ expected_pr_base_sha }}"
   hosts: localhost
@@ -59,7 +59,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_BASE_SHA_BUILDTIME={{ expected_pr_base_sha }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_TITLE_BUILDTIME={{ expected_pr_title }}"
   hosts: localhost
@@ -68,7 +68,7 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_TITLE_BUILDTIME={{ expected_pr_title }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml
 
 - name: "{{ testname }} - check if {{ project }} is deployed with searching for LAGOON_PR_TITLE={{ expected_pr_title }}"
   hosts: localhost
@@ -77,4 +77,4 @@
     url: "{{ url }}"
     expected_content: "LAGOON_PR_TITLE={{ expected_pr_title }}"
   tasks:
-  - include: check-url-content.yaml
+  - ansible.builtin.include_tasks: check-url-content.yaml

tests/requirements.txt

@@ -1,4 +1,4 @@
-ansible-core==2.11.12
+ansible-core==2.15.4
 jmespath==1.0.1
 kubernetes==25.3.0
 PyJWT==2.6.0

tests/tasks/api/add-deploytarget.yaml

@@ -1,6 +1,6 @@
 - name: "Add deploy target to project {{ project }}"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "{{ testname }} - POST api get project by name with target project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"

tests/tasks/api/add-environment-variable.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - POST api add envVariable with target environment {{ branch }} on project {{ project }} to {{ graphql_url }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "{{ testname }} - POST api add envVariable with target environment {{ branch }} on project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"
@@ -17,4 +17,4 @@
         msg: "api response: {{ apiresponse.json }}"
     - fail:
         msg: "error adding environment variable"
-      when: apiresponse.json.data.addOrUpdateEnvVariableByName.name is not defined
+      when: apiresponse.json.data.addOrUpdateEnvVariableByName.name is not defined

tests/tasks/api/add-environment.yaml

@@ -1,6 +1,6 @@
 - name: "Add environment {{ name }} to project {{ project }}"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "{{ testname }} - POST api get project by name with target project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"

tests/tasks/api/add-project-variable.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - POST api add envVariable with target project {{ project }} to {{ graphql_url }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "{{ testname }} - POST api add envVariable with target project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"
@@ -16,4 +16,4 @@
         msg: "api response: {{ apiresponse.json }}"
     - fail:
         msg: "error adding environment variable"
-      when: apiresponse.json.data.addOrUpdateEnvVariableByName.name is not defined
+      when: apiresponse.json.data.addOrUpdateEnvVariableByName.name is not defined

tests/tasks/api/add-project.yaml

@@ -1,6 +1,6 @@
 - name: "Add project {{ project }} to openshift {{ openshift }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "Add project {{ project }} to openshift {{ openshift }}"
       uri:
         url: "{{ graphql_url }}"

tests/tasks/api/delete-environment-variable.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - POST api delete envVariable with target environment {{ branch }} on project {{ project }} to {{ graphql_url }}"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "{{ testname }} - POST api delete envVariable with target environment {{ branch }} on project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"
@@ -17,4 +17,4 @@
         msg: "api response: {{ apiresponse.json }}"
     - fail:
         msg: "error deleting environment variable"
-      when: apiresponse.json.errors[0].message is defined and apiresponse.json.errors[0].message is not search("doesn't exist")
+      when: apiresponse.json.errors[0].message is defined and apiresponse.json.errors[0].message is not search("doesn't exist")

tests/tasks/api/delete-environment.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - POST api deleteEnvironment with project {{ project }} and branch {{ branch }} to {{ graphql_url }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "{{ testname }} - POST api deleteEnvironment with project {{ project }} and branch {{ branch }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"

tests/tasks/api/delete-project-variable.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - POST api delete envVariable with target project {{ project }} to {{ graphql_url }}"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "{{ testname }} - POST api delete envVariable with target project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"
@@ -16,4 +16,4 @@
         msg: "api response: {{ apiresponse.json }}"
     - fail:
         msg: "error deleting environment variable"
-      when: apiresponse.json.data.deleteEnvVariableByName != "success"
+      when: apiresponse.json.data.deleteEnvVariableByName != "success"

tests/tasks/api/delete-project.yaml

@@ -1,6 +1,6 @@
 - name: "Delete project {{ project }} from openshift {{ openshift }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "Delete project {{ project }} from openshift {{ openshift }}"
       uri:
         url: "{{ graphql_url }}"

tests/tasks/api/deploy-bulk-deployment.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - Trigger a bulk deployment for environments to {{ graphql_url }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "{{ testname }} - create the bulk deployment environments input"
       set_fact:
         environments: >
@@ -21,4 +21,4 @@
       debug:
         msg: "api response: {{ apiresponse.json }}"
     - set_fact:
-        bulk_deploy_id: "{{ apiresponse.json.data.bulkDeployEnvironmentLatest }}"
+        bulk_deploy_id: "{{ apiresponse.json.data.bulkDeployEnvironmentLatest }}"

tests/tasks/api/deploy-no-sha.yaml

@@ -1,6 +1,6 @@
 - name: "Start deployEnvironmentBranch (no SHA) loop with 3 retries"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "Set the retry count to {{ retry_count }}"
       set_fact:
         retry_count: "{{ 0 if retry_count is undefined else retry_count|int + 1 }}"

tests/tasks/api/deploy-pullrequest.yaml

@@ -1,6 +1,6 @@
 - name: "Start deployEnvironmentPullrequest loop with 3 retries"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "Set the retry count to {{ retry_count }}"
       set_fact:
         retry_count: "{{ 0 if retry_count is undefined else retry_count|int + 1 }}"

tests/tasks/api/deploy-sha.yaml

@@ -1,6 +1,6 @@
 - name: "Start deployEnvironmentBranch (SHA) loop with 3 retries"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "Set the retry count to {{ retry_count }}"
       set_fact:
         retry_count: "{{ 0 if retry_count is undefined else retry_count|int + 1 }}"

tests/tasks/api/get-bulk-deployment.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - Trigger a bulk deployment for environments to {{ graphql_url }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - debug:
         msg: "{{ bulk_deploy_id }}"
     - name: "{{ testname }} - POST api check new bulk deployments for environments to {{ graphql_url }}"
@@ -23,7 +23,7 @@
       retries: 30
       delay: 10
 
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "{{ testname }} - POST api check running bulk deployments for environments to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"
@@ -44,7 +44,7 @@
       retries: 60
       delay: 10
 
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "{{ testname }} - POST api check completed bulk deployments for environments to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"

tests/tasks/api/promote.yaml

@@ -1,6 +1,6 @@
 - name: "{{ testname }} - POST api deployEnvironmentPromote with source environment {{ source_environment }}, target environment {{ promote_environment }} and project {{ project }} to {{ graphql_url }}"
   block:
-    - include: refresh-token.yaml
+    - ansible.builtin.include_tasks: refresh-token.yaml
     - name: "{{ testname }} - POST api deployEnvironmentPromote with source environment {{ source_environment }}, target environment {{ promote_environment }} and project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"

tests/tasks/api/update-project-routerpattern.yaml

@@ -1,6 +1,6 @@
 - name: "Update project routerpattern for {{ project }} to openshift {{ openshift }}"
   block:
-    - include: admin-token.yaml
+    - ansible.builtin.include_tasks: admin-token.yaml
     - name: "{{ testname }} - POST api get project by name with target project {{ project }} to {{ graphql_url }}"
       uri:
         url: "{{ graphql_url }}"