WIP: GitHub Actions without docker images 12

3 files changed, 30 insertions, 26 deletions

diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml
index efe6728fd8..64a61990dc 100644
--- a/.github/workflows/test-erlang-otp-23.1.yaml
+++ b/.github/workflows/test-erlang-otp-23.1.yaml
@@ -9183,9 +9183,8 @@ jobs:
         elixir-version: 1.10.4
     - name: PREPARE TERRAFORM SECRETS
       run: |
-        mkdir terraform && chmod 777 terraform
-        echo "${{ secrets.TERRAFORM_SSH_KEY }}" > terraform/id_rsa_terraform
-        echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > terraform/id_rsa_terraform.pub
+        echo "${{ secrets.TERRAFORM_SSH_KEY }}" > id_rsa_terraform
+        echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > id_rsa_terraform.pub
     - name: RUN TESTS
       run: |
         make -C deps/rabbitmq_peer_discovery_aws tests \
@@ -9193,7 +9192,11 @@ jobs:
           current_rmq_ref=${{ steps.ref.outputs.branch_or_tag_name }} \
           FULL= \
           FAIL_FAST=1 \
-          SKIP_AS_ERROR=1
+          SKIP_AS_ERROR=1 \
+          ERLANG_VERSION=23.1 \
+          AWS_ACCESS_KEY_ID=${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }} \
+          AWS_SECRET_ACCESS_KEY=${{ secrets.CONCOURSE_AWS_SECRET_ACCESS_KEY }} \
+          SSH_KEY=$PWD/id_rsa_terraform
     - name: ON FAILRUE ARCHIVE TESTS LOGS
       if: failure()
       run: |
diff --git a/.github/workflows/test-erlang-otp-git.yaml b/.github/workflows/test-erlang-otp-git.yaml
index 226022435c..f78ba74483 100644
--- a/.github/workflows/test-erlang-otp-git.yaml
+++ b/.github/workflows/test-erlang-otp-git.yaml
@@ -4212,9 +4212,8 @@ jobs:
         elixir-version: 1.10.4
     - name: PREPARE TERRAFORM SECRETS
       run: |
-        mkdir terraform && chmod 777 terraform
-        echo "${{ secrets.TERRAFORM_SSH_KEY }}" > terraform/id_rsa_terraform
-        echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > terraform/id_rsa_terraform.pub
+        echo "${{ secrets.TERRAFORM_SSH_KEY }}" > id_rsa_terraform
+        echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > id_rsa_terraform.pub
     - name: RUN TESTS
       run: |
         make -C deps/rabbitmq_peer_discovery_aws tests \
@@ -4222,7 +4221,11 @@ jobs:
           current_rmq_ref=${{ steps.ref.outputs.branch_or_tag_name }} \
           FULL= \
           FAIL_FAST=1 \
-          SKIP_AS_ERROR=1
+          SKIP_AS_ERROR=1 \
+          ERLANG_VERSION=git \
+          AWS_ACCESS_KEY_ID=${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }} \
+          AWS_SECRET_ACCESS_KEY=${{ secrets.CONCOURSE_AWS_SECRET_ACCESS_KEY }} \
+          SSH_KEY=$PWD/id_rsa_terraform
     - name: ON FAILRUE ARCHIVE TESTS LOGS
       if: failure()
       run: |
diff --git a/workflow_sources/test/tests.lib.yml b/workflow_sources/test/tests.lib.yml
index e3ab7752ac..fbe71a1d09 100644
--- a/workflow_sources/test/tests.lib.yml
+++ b/workflow_sources/test/tests.lib.yml
@@ -19,10 +19,21 @@ steps:
   #@ if getattr(dep, 'use_terraform', False):
   - name: PREPARE TERRAFORM SECRETS
     run: |
-      mkdir terraform && chmod 777 terraform
-      echo "${{ secrets.TERRAFORM_SSH_KEY }}" > terraform/id_rsa_terraform
-      echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > terraform/id_rsa_terraform.pub
-  #@ end
+      echo "${{ secrets.TERRAFORM_SSH_KEY }}" > id_rsa_terraform
+      echo "${{ secrets.TERRAFORM_SSH_KEY_PUB }}" > id_rsa_terraform.pub
+  - name: RUN TESTS
+    run: |
+      make -C deps/(@= dep.name @) tests \
+        base_rmq_ref=(@= data.values.base_rmq_ref @) \
+        current_rmq_ref=${{ steps.ref.outputs.branch_or_tag_name }} \
+        FULL= \
+        FAIL_FAST=1 \
+        SKIP_AS_ERROR=1 \
+        ERLANG_VERSION=(@= erlang_version @) \
+        AWS_ACCESS_KEY_ID=${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }} \
+        AWS_SECRET_ACCESS_KEY=${{ secrets.CONCOURSE_AWS_SECRET_ACCESS_KEY }} \
+        SSH_KEY=$PWD/id_rsa_terraform
+  #@ else:
   - name: RUN TESTS
     run: |
       make -C deps/(@= dep.name @) tests \
@@ -31,6 +42,7 @@ steps:
         FULL= \
         FAIL_FAST=1 \
         SKIP_AS_ERROR=1
+  #@ end
   - name: ON FAILRUE ARCHIVE TESTS LOGS
     if: failure()
     run: |
@@ -43,17 +55,3 @@ steps:
       name: (@= dep.name @)-ct-logs
       path: "deps/(@= dep.name @)/*-ct-logs-*.tar.xz"
 #@ end
-
-#@ def additional_docker_args(dep, erlang_version=None):
-#@   if getattr(dep, 'use_terraform', False):
-#@     args = []
-#@     args.append("--env ERLANG_VERSION={}".format(erlang_version))
-#@     args.append("--env AWS_ACCESS_KEY_ID=${{ secrets.CONCOURSE_AWS_ACCESS_KEY_ID }}")
-#@     args.append("--env AWS_SECRET_ACCESS_KEY=${{ secrets.CONCOURSE_AWS_SECRET_ACCESS_KEY }}")
-#@     args.append("--env SSH_KEY=/workspace/terraform/id_rsa_terraform")
-#@     args.append("--volume ${PWD}/terraform:/workspace/terraform")
-#@     return " \\\n  ".join(args)
-#@   else:
-#@     return ""
-#@   end
-#@ end
\ No newline at end of file