activation tests fix

ansible · Aug 19, 2024 · 47c85b2 · 47c85b2
1 parent 08d98f5
commit 47c85b2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 31 deletions.
diff --git a/.config/dictionary.txt b/.config/dictionary.txt
@@ -63,3 +63,4 @@ hdrs
 testuser
 testsecret
 keygen
+testpass
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -24,12 +24,6 @@ jobs:
         ansible-version:
           - "milestone"
 
-    env:
-      CONTROLLER_URL: "https://localhost:8443"
-      CONTROLLER_USERNAME: "admin"
-      CONTROLLER_PASSWORD: "testpass"
-      CONTROLLER_VERIFY_SSL: false
-
     steps:
       - name: Checkout ansible/eda
         uses: actions/checkout@v3
@@ -66,6 +60,24 @@ jobs:
           --disable-pip-version-check
         shell: bash
 
+      - name: Print the ansible version
+        run: ansible --version
+
+      - name: Create integration_config.yml
+        env:
+          CONTROLLER_HOST: ${{ env.CONTROLLER_HOST }}
+          CONTROLLER_USERNAME: ${{ env.CONTROLLER_USERNAME }}
+          CONTROLLER_PASSWORD: ${{ secrets.CONTROLLER_PASSWORD }}
+          CONTROLLER_VERIFY_SSL: ${{ env.CONTROLLER_VERIFY_SSL }}
+        run: |
+          touch tests/integration/integration_config.yml
+          echo "controller_host: '${{ env.CONTROLLER_HOST }}'" >> tests/integration/integration_config.yml
+          echo "controller_username: '${{ env.CONTROLLER_USERNAME }}'" >> tests/integration/integration_config.yml
+          echo "controller_password: '${{ secrets.CONTROLLER_PASSWORD }}'" >> tests/integration/integration_config.yml
+          echo "controller_verify_ssl: '${{ env.CONTROLLER_VERIFY_SSL }}'" >> tests/integration/integration_config.yml
+          cat tests/integration/integration_config.yml
+        working-directory: ansible_collections/ansible/eda
+
       - name: Run integration tests
         run: ansible-test integration -v
         working-directory: ansible_collections/ansible/eda
diff --git a/tests/integration/integration_config.yaml b/tests/integration/integration_config.yaml
@@ -0,0 +1,4 @@
+controller_host: "https://localhost:8443"
+controller_username: "admin"
+controller_password: "testpass"
+controller_verify_ssl: false
diff --git a/tests/integration/targets/activation/tasks/main.yml b/tests/integration/targets/activation/tasks/main.yml
@@ -1,11 +1,7 @@
 ---
 - block:
-    - set_fact:
-        credential_defaults: &credential_defaults
-          controller_username: "{{ controller_username }}"
-          controller_password: "{{ controller_password }}"
-          controller_host: "{{ controller_host }}"
-          validate_certs: false
+    - debug:
+        msg: "{{ controller_host }}"
 
     - name: Generate a random_string for the test
       set_fact:
@@ -32,15 +28,13 @@
 
     - name: Create an AWX controller token
       ansible.eda.controller_token:
-        <<: *credential_defaults
         name: "{{ awx_token_name }}"
         description: "A test AWX controller token description"
         token: "{{ token_value }}"
         state: present
 
     - name: Create a new credential type
       ansible.eda.credential_type:
-        <<: *credential_defaults
         name: "{{ credential_type_name }}"
         state: present
         description: "A test credential type"
@@ -88,7 +82,6 @@
 
     - name: Create a new SCM credential
       ansible.eda.credential:
-        <<: *credential_defaults
         name: "{{ credential_name }}"
         state: present
         credential_type_name: Source Control
@@ -107,7 +100,6 @@
 
     - name: Create a new project
       ansible.eda.project:
-        <<: *credential_defaults
         name: "{{ project_name }}"
         description: "Test Project Description"
         url: "{{ scm_url }}"
@@ -123,7 +115,6 @@
 
     - name: Create a new decision environment
       ansible.eda.decision_environment:
-        <<: *credential_defaults
         name: "{{ decision_env_name }}"
         description: "Test Decision Environment Description"
         credential: "{{ credential_name }}"
@@ -132,7 +123,6 @@
 
     - name: Create a new rulebook activation in check mode
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         description: "Example Activation description"
         project_name: "{{ project_name }}"
@@ -150,7 +140,6 @@
 
     - name: Create a new rulebook activation
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         description: "Example Activation description"
         project_name: "{{ project_name }}"
@@ -167,7 +156,6 @@
 
     - name: Create a new rulebook activation again
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         description: "Example Activation description"
         project_name: "{{ project_name }}"
@@ -185,16 +173,13 @@
 
     - name: Get information about the rulebook activation
       ansible.eda.activation_info:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
 
     - name: List all the rulebook activations
       ansible.eda.activation_info:
-        <<: *credential_defaults
 
     - name: Delete project
       ansible.eda.project:
-        <<: *credential_defaults
         name: "{{ project_name }}"
         state: absent
       register: project_deletion
@@ -207,7 +192,6 @@
 
     - name: Delete credential
       ansible.eda.credential:
-        <<: *credential_defaults
         name: "{{ credential_name }}"
         state: absent
       register: credential_deletion
@@ -220,49 +204,42 @@
 
     - name: Delete rulebook activation
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         state: absent
 
   always:
     - name: Delete AWX token
       ansible.eda.controller_token:
-        <<: *credential_defaults
         name: "{{ awx_token_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete project
       ansible.eda.project:
-        <<: *credential_defaults
         name: "{{ project_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete decision environment
       ansible.eda.decision_environment:
-        <<: *credential_defaults
         name: "{{ decision_env_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete credential
       ansible.eda.credential:
-        <<: *credential_defaults
         name: "{{ credential_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete credential type
       ansible.eda.credential_type:
-        <<: *credential_defaults
         name: "{{ credential_type_name }}"
         state: absent
       ignore_errors: true
 
     - name: Delete rulebook activation
       ansible.eda.activation:
-        <<: *credential_defaults
         name: "{{ activation_name }}"
         state: absent
       ignore_errors: true