Merge pull request #446 from goneri/Revert-aws-decipher-.age-files-on…

…-the-file_28457 Revert "aws: decipher .age files on the file" This reverts the following commits: b0f3309 43931e1 c239393 f5b662b
ansible · Sep 22, 2022 · 3d8befc · 3d8befc
2 parents 6bf926f + 021f5d8
commit 3d8befc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 68 deletions.
diff --git a/playbooks/age/pre.yaml b/playbooks/age/pre.yaml
diff --git a/...s/aws-deploy-artifacts/defaults/main.yaml → roles/deploy-artifacts/defaults/main.yaml b/...s/aws-deploy-artifacts/defaults/main.yaml → roles/deploy-artifacts/defaults/main.yaml
@@ -2,3 +2,4 @@
 deploy_artifacts_type:
     - ansible_collection
     - python_sdist
+deploy_artifacts_venv_path: ~/venv
diff --git a/roles/aws-deploy-artifacts/tasks/main.yaml → roles/deploy-artifacts/tasks/main.yaml b/roles/aws-deploy-artifacts/tasks/main.yaml → roles/deploy-artifacts/tasks/main.yaml
@@ -16,14 +16,8 @@
   with_items: "{{ zuul.artifacts }}"
   when: "'metadata' in item and 'type' in item.metadata and (item.metadata.type == 'ansible_collection')"
 
-- name: Install ansible
-  package:
-    name: ansible-core
-    state: present
-  become: true
-
 - name: Install require-project collection using ansible-galaxy
   args:
-    chdir: ~/downloads
+    chdir: "{{ ansible_user_dir }}/downloads"
     executable: /bin/bash
-  shell: "ansible-galaxy collection install {{ __collections }}"
+  shell: "source {{ deploy_artifacts_venv_path }}/bin/activate; ansible-galaxy collection install {{ __collections }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -155,12 +155,9 @@
     name: ansible-core-ci-aws-session
     description: |
       Create an AWS/sts session with an ansible-core-ci key.
-    pre-run:
-      - playbooks/ansible-core-ci/pre.yaml
-      - playbooks/age/pre.yaml
+    pre-run: playbooks/ansible-core-ci/pre.yaml
     secrets:
       - ansible_core_ci
-      - age
 
 - job:
     name: release-ansible-python

diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
@@ -3753,21 +3753,3 @@
           7HRHFBtrU+ykHynu4k597BvE3P5aMHTAHm6bJkvk4WtmVnKkigbZcVFExV4Y009R4gSEd
           xKsFcGxouyfAXaaLxsfXRVvadB4SNiMyLucepOmFC3m7O7WNEgMjS1NpKNg7ddmUXURfk
           HgVJ2m2n7fiyHwpFVQ2WraPxNdMfAaHRJ+Mm8w96UIMvgy8LjFSePCZRhUWjTE=
-
-#### AGE #####
-- secret:
-    name: age
-    data:
-      # created: 2022-09-08T13:35:22-04:00
-      # public key: age1tugmwue6qmc0k9wqz0ktd7yrx274ws6xcuuj8q7t6e6499hypuxsenduws
-      key_txt: !encrypted/pkcs1-oaep
-        - UEVqMvCxHFKUEqN/VLE4PZCKGwTrdu8j3EZXkTlE4uDDOyCBId/SqLajUbkQRtp7gLBuL
-          TiA9kjLH5hseC3NxhEka5IbL4YyWwZCvc5VHmJQrGJwyE0vs1AV3jmVtMV56a+8iCx2rF
-          +M3KhapDjIfsFoVhNX0bn8Sj9hQLjM5bec5UCutjtyoG5rjHtspQ+xc/JX2NQF0zhQZfB
-          1DMd2XKAX1lTmts8/xIJAQHtIzOcpgUyJLZiOwqlDvhxqbcFzFqlnIvpkqMs0mfVVN6v7
-          PY5CBGHeKYksQew+eRslP+zMYoicF82a3W5H9EQ6nT6yfEltzWUgDKY2hUBXHCHbRwq09
-          GPBs4fol4girkBXYcVPJIr2gVMVflk5yVClezVd5/N79PbySoIxvXJlxPyzE2BQejMQXk
-          Hd65ne08xES5oEYAhE43Mgf0Nac7xTTIN0DQM0JHh9eoDt1zLlk+W6FYeixTve/2Usq9i
-          g6zxgtcDbiaHRY8piwG4OGBFydODEniPk5GCIjlV2J9nKxKcewk9saBdCv2hR9YC8LQvj
-          pm+ORPVeVC1mqvDfRzyJ3+/qbP9B3mBqfYNJbqdid7xw9X+wSLdRzkGg2+4S29qjJEeTX
-          XyATUbYmwIpg2KIv6dhvCKNyojH0ANKXT8vQxoPWIXIS1PejKc0gUcnhOec0nQ=