fix(workflow): tests integration

scaleway · Oct 15, 2024 · 302ede9 · 302ede9
1 parent 932c033
commit 302ede9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/ansible-test-integration.yml b/.github/workflows/ansible-test-integration.yml
@@ -82,14 +82,11 @@ jobs:
       - name: Perform testing
         uses: ansible-community/ansible-test-gh-action@release/v1
         with:
-          pre-test-cmd: >-
-            SCW_ACCESS_KEY=${{ secrets.SCW_ACCESS_KEY }}
-            SCW_SECRET_KEY=${{ secrets.SCW_SECRET_KEY }}
-            SCW_DEFAULT_PROJECT_ID=${{ secrets.SCW_DEFAULT_PROJECT_ID }}
-            eval
-            "echo \"$(cat "tests/integration/integration_config.yml.template")\""
-            > tests/integration/integration_config.yml
           target-python-version: 3.9
           controller-python-version: auto
           target: ${{ matrix.module }}
           testing-type: integration
+        env:
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
+          SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
diff --git a/tests/integration/targets/scaleway_registry_namespace/tasks/main.yml b/tests/integration/targets/scaleway_registry_namespace/tasks/main.yml
@@ -25,9 +25,9 @@
     scaleway.scaleway.scaleway_registry_namespace:
       name: "{{ resource_name }}"
       region: "{{ resource_region }}"
-      project_id: "{{ scw_default_project_id }}"
-      access_key: "{{ scw_access_key }}"
-      secret_key: "{{ scw_secret_key }}"
+      project_id: "{{ lookup('env', 'SCW_DEFAULT_PROJECT_ID') }}"
+      access_key: "{{ lookup('env', 'SCW_ACCESS_KEY') }}"
+      secret_key: "{{ lookup('env', 'SCW_SECRET_KEY') }}"
       state: present
       description: "{{ resource_description }}"
       is_public: "{{ resource_is_public }}"
@@ -37,9 +37,9 @@
     scaleway.scaleway.scaleway_registry_namespace:
       name: "{{ resource_name }}"
       region: "{{ resource_region }}"
-      project_id: "{{ scw_default_project_id }}"
-      access_key: "{{ scw_access_key }}"
-      secret_key: "{{ scw_secret_key }}"
+      project_id: "{{ lookup('env', 'SCW_DEFAULT_PROJECT_ID') }}"
+      access_key: "{{ lookup('env', 'SCW_ACCESS_KEY') }}"
+      secret_key: "{{ lookup('env', 'SCW_SECRET_KEY') }}"
       state: absent
       description: "{{ resource_description }}"
       is_public: "{{ resource_is_public }}"
@@ -50,9 +50,9 @@
     scaleway.scaleway.scaleway_registry_namespace:
       name: "{{ resource_name }}"
       region: "{{ resource_region }}"
-      project_id: "{{ scw_default_project_id }}"
-      access_key: "{{ scw_access_key }}"
-      secret_key: "{{ scw_secret_key }}"
+      project_id: "{{ lookup('env', 'SCW_DEFAULT_PROJECT_ID') }}"
+      access_key: "{{ lookup('env', 'SCW_ACCESS_KEY') }}"
+      secret_key: "{{ lookup('env', 'SCW_SECRET_KEY') }}"
       state: present
       description: "{{ resource_description }}"
       is_public: "{{ resource_is_public }}"