Fix up ci paths broken by previous commit

4 files changed, 14 insertions, 16 deletions

diff --git a/.github/workflows/test-erlang-otp-22.3.yaml b/.github/workflows/test-erlang-otp-22.3.yaml
index 83dbb6844d..376e8ccbdb 100644
--- a/.github/workflows/test-erlang-otp-22.3.yaml
+++ b/.github/workflows/test-erlang-otp-22.3.yaml
@@ -17,8 +17,6 @@ jobs:
         echo "::set-output name=branch_or_tag_name::$branch_or_tag_name"
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v2
-      with:
-        path: rabbitmq
     - name: PREPARE BUILD IMAGE
       uses: docker/build-push-action@v1
       with:
@@ -26,7 +24,7 @@ jobs:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci
-        dockerfile: rabbitmq/ci/dockerfiles/ci
+        dockerfile: ci/dockerfiles/ci
         build_args: ERLANG_VERSION=22.3,GITHUB_RUN_ID=${{ github.run_id }},BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }},GITHUB_SHA=${{ github.sha }},base_rmq_ref=master,current_rmq_ref=${{ steps.buildevents.outputs.branch_or_tag_name }},RABBITMQ_VERSION=3.9.0
         tags: erlang-22.3-rabbitmq-${{ github.sha }}
     - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml
index cd3027169e..62edbf753d 100644
--- a/.github/workflows/test-erlang-otp-23.1.yaml
+++ b/.github/workflows/test-erlang-otp-23.1.yaml
@@ -17,8 +17,6 @@ jobs:
         echo "::set-output name=branch_or_tag_name::$branch_or_tag_name"
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v2
-      with:
-        path: rabbitmq
     - name: PREPARE BUILD IMAGE
       uses: docker/build-push-action@v1
       with:
@@ -26,7 +24,7 @@ jobs:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci
-        dockerfile: rabbitmq/ci/dockerfiles/ci
+        dockerfile: ci/dockerfiles/ci
         build_args: ERLANG_VERSION=23.1,GITHUB_RUN_ID=${{ github.run_id }},BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }},GITHUB_SHA=${{ github.sha }},base_rmq_ref=master,current_rmq_ref=${{ steps.buildevents.outputs.branch_or_tag_name }},RABBITMQ_VERSION=3.9.0
         tags: erlang-23.1-rabbitmq-${{ github.sha }}
     - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
diff --git a/.github/workflows/test-erlang-otp-git.yaml b/.github/workflows/test-erlang-otp-git.yaml
index 6e23adacf5..8f4c501a81 100644
--- a/.github/workflows/test-erlang-otp-git.yaml
+++ b/.github/workflows/test-erlang-otp-git.yaml
@@ -19,8 +19,6 @@ jobs:
         echo "::set-output name=branch_or_tag_name::$branch_or_tag_name"
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v2
-      with:
-        path: rabbitmq
     - name: CHECKOUT ERLANG/OTP MASTER
       uses: actions/checkout@v2
       with:
@@ -39,7 +37,7 @@ jobs:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/erlang_elixir
-        dockerfile: rabbitmq/ci/dockerfiles/git/erlang_elixir
+        dockerfile: ci/dockerfiles/git/erlang_elixir
         build_args: ERLANG_VERSION=${{ steps.erlang_sha.outputs.erlang_sha }}
         tags: git
     - name: CREATE BASE CI IMAGE (git)
@@ -49,9 +47,12 @@ jobs:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci-base
-        dockerfile: rabbitmq/ci/dockerfiles/ci-base
+        dockerfile: ci/dockerfiles/ci-base
         build_args: ERLANG_VERSION=git,SECONDARY_UMBRELLA_GITREFS=v3.7.28 v3.8.9
         tags: git
+    - name: CLEANUP ERLANG/OTP MASTER
+      run: |
+        rm -rf erlang-git-master
     - name: PREPARE BUILD IMAGE
       uses: docker/build-push-action@v1
       with:
@@ -59,7 +60,7 @@ jobs:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci
-        dockerfile: rabbitmq/ci/dockerfiles/ci
+        dockerfile: ci/dockerfiles/ci
         build_args: ERLANG_VERSION=git,GITHUB_RUN_ID=${{ github.run_id }},BUILDEVENT_APIKEY=${{ secrets.HONEYCOMB_API_KEY }},GITHUB_SHA=${{ github.sha }},base_rmq_ref=master,current_rmq_ref=${{ steps.buildevents.outputs.branch_or_tag_name }},RABBITMQ_VERSION=3.9.0
         tags: erlang-git-rabbitmq-${{ github.sha }}
     - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
diff --git a/workflow_sources/test/prepare.lib.yml b/workflow_sources/test/prepare.lib.yml
index 67b8e485e1..825df029c9 100644
--- a/workflow_sources/test/prepare.lib.yml
+++ b/workflow_sources/test/prepare.lib.yml
@@ -20,8 +20,6 @@ prepare:
         echo "::set-output name=branch_or_tag_name::$branch_or_tag_name"
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v2
-      with:
-        path: rabbitmq
     #@ if build_base_image:
     - name: CHECKOUT ERLANG/OTP MASTER
       uses: actions/checkout@v2
@@ -41,7 +39,7 @@ prepare:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/erlang_elixir
-        dockerfile: #@ 'rabbitmq/ci/dockerfiles/{}/erlang_elixir'.format(erlang_version)
+        dockerfile: #@ 'ci/dockerfiles/{}/erlang_elixir'.format(erlang_version)
         #@ build_args = {}
         #@ build_args["ERLANG_VERSION"] = "${{ steps.erlang_sha.outputs.erlang_sha }}"
         build_args: #@ to_build_args(build_args)
@@ -53,12 +51,15 @@ prepare:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci-base
-        dockerfile: rabbitmq/ci/dockerfiles/ci-base
+        dockerfile: ci/dockerfiles/ci-base
         #@ build_args = {}
         #@ build_args["ERLANG_VERSION"] = erlang_version
         #@ build_args["SECONDARY_UMBRELLA_GITREFS"] = ' '.join(data.values.secondary_umbrella_gitrefs)
         build_args: #@ to_build_args(build_args)
         tags: #@ erlang_version
+    - name: CLEANUP ERLANG/OTP MASTER
+      run: |
+        rm -rf erlang-git-master
     #@ end
     - name: PREPARE BUILD IMAGE
       uses: docker/build-push-action@v1
@@ -67,7 +68,7 @@ prepare:
         password: ${{ secrets.GCR_JSON_KEY }}
         registry: eu.gcr.io
         repository: cf-rabbitmq-core/ci
-        dockerfile: rabbitmq/ci/dockerfiles/ci
+        dockerfile: ci/dockerfiles/ci
         #@ build_args = {}
         #@ build_args["ERLANG_VERSION"] = erlang_version
         #@ build_args["GITHUB_RUN_ID"] = '${{ github.run_id }}'