Rename arfifacts and compose profile

Consensys · Oct 18, 2024 · 38276df · 38276df
1 parent b316118
commit 38276df
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/.github/workflows/coordinator-build-and-publish.yml b/.github/workflows/coordinator-build-and-publish.yml
@@ -83,14 +83,14 @@ jobs:
       - name: Save Docker image as artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         run: |
-          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-coordinator.tar.gz
+          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-coordinator-docker-image.tar.gz
         shell: bash
-      - name: Upload artifact
+      - name: Upload Docker image artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         uses: actions/upload-artifact@v4
         with:
           name: linea-coordinator
-          path: linea-coordinator.tar.gz
+          path: linea-coordinator-docker-image.tar.gz
       - name: Login to Docker Hub
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
         uses: docker/login-action@v3

diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml
@@ -79,14 +79,14 @@ jobs:
       - name: Save Docker image as artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         run: |
-          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-postman.tar.gz
+          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-postman-docker-image.tar.gz
         shell: bash
-      - name: Upload artifact
+      - name: Upload Docker image artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         uses: actions/upload-artifact@v4
         with:
           name: linea-postman
-          path: linea-postman.tar.gz
+          path: linea-postman-docker-image.tar.gz
       - name: Login to Docker Hub
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
         uses: docker/login-action@v3

diff --git a/.github/workflows/prover-build-and-publish.yml b/.github/workflows/prover-build-and-publish.yml
@@ -82,14 +82,14 @@ jobs:
       - name: Save Docker image as artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         run: |
-          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-prover.tar.gz
+          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-prover-docker-image.tar.gz
         shell: bash
-      - name: Upload artifact
+      - name: Upload Docker image artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         uses: actions/upload-artifact@v4
         with:
           name: linea-prover
-          path: linea-prover.tar.gz
+          path: linea-prover-docker-image.tar.gz
       - name: Login to Docker Hub
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
         uses: docker/login-action@v3

diff --git a/.github/workflows/reuse-run-e2e-tests.yml b/.github/workflows/reuse-run-e2e-tests.yml
@@ -94,15 +94,15 @@ jobs:
           retry_wait_seconds: 30
           timeout_minutes: 10
           command: |
-            make pull-images-for-ci-testing
-      - name: Download local docker images
+            make pull-images-external-to-monorepo
+      - name: Download local docker image artifacts
         uses: actions/download-artifact@v4
       - name: Load Docker images
         run: |
-          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-coordinator/linea-coordinator.tar.gz | docker load &&
-          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-postman/linea-postman.tar.gz | docker load &&
-          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-prover/linea-prover.tar.gz | docker load &&
-          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-traces-api-facade/linea-traces-api-facade.tar.gz | docker load
+          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-coordinator/linea-coordinator-docker-image.tar.gz | docker load &&
+          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-postman/linea-postman-docker-image.tar.gz | docker load &&
+          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-prover/linea-prover-docker-image.tar.gz | docker load &&
+          gunzip -c /runner/_work/linea-monorepo/linea-monorepo/linea-traces-api-facade/linea-traces-api-facade-docker-image.tar.gz | docker load
         shell: bash
       - name: Spin up fresh environment with geth tracing with retry
         if: ${{ inputs.tracing-engine == 'geth' }}

diff --git a/.github/workflows/traces-api-facade-build-and-publish.yml b/.github/workflows/traces-api-facade-build-and-publish.yml
@@ -87,14 +87,14 @@ jobs:
       - name: Save Docker image as artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         run: |
-          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-traces-api-facade.tar.gz
+          docker save ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }} | gzip > linea-traces-api-facade-docker-image.tar.gz
         shell: bash
-      - name: Upload artifact
+      - name: Upload Docker image artifact
         if: ${{ env.PUSH_IMAGE == 'false' && github.event_name == 'pull_request' }}
         uses: actions/upload-artifact@v4
         with:
           name: linea-traces-api-facade
-          path: linea-traces-api-facade.tar.gz
+          path: linea-traces-api-facade-docker-image.tar.gz
       - name: Login to Docker Hub
         if: ${{ env.PUSH_IMAGE == 'true' || github.event_name == 'workflow_dispatch' }}
         uses: docker/login-action@v3

diff --git a/Makefile b/Makefile
@@ -60,8 +60,8 @@ start-whole-environment-traces-v2-with-finalized-tag-updater:
 pull-all-images:
 		docker compose -f docker/compose.yml -f docker/compose-local-dev-traces-v2.overrides.yml --profile l1 --profile l2 pull
 
-pull-images-for-ci-testing:
-		docker compose -f docker/compose.yml -f docker/compose-local-dev-traces-v2.overrides.yml --profile ci-testing pull
+pull-images-external-to-monorepo:
+		docker compose -f docker/compose.yml -f docker/compose-local-dev-traces-v2.overrides.yml --profile external-to-monorepo pull
 
 compile-contracts:
 		cd contracts; \

diff --git a/docker/compose.yml b/docker/compose.yml
@@ -24,7 +24,7 @@ services:
     hostname: sequencer
     container_name: sequencer
     image: consensys/linea-besu:${SEQUENCER_TAG:-24.10-delivery34}
-    profiles: [ "l2", "l2-bc", "debug", "ci-testing" ]
+    profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     depends_on:
       linea-besu-sequencer-plugin-downloader:
         condition: service_completed_successfully
@@ -88,7 +88,7 @@ services:
     hostname: l2-node
     image: consensys/linea-geth:${ZKGETH_TAG:-0588665}
     platform: linux/amd64
-    profiles: [ "l2", "l2-bc", "debug", "ci-testing" ]
+    profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     depends_on:
       sequencer:
         condition: service_healthy
@@ -122,7 +122,7 @@ services:
     hostname: traces-node
     image: consensys/linea-geth:${ZKGETH_TAG:-0588665}
     platform: linux/amd64
-    profiles: [ "l2", "l2-bc", "debug", "ci-testing" ]
+    profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     depends_on:
       sequencer:
         condition: service_healthy
@@ -296,7 +296,7 @@ services:
     hostname: web3signer
     container_name: web3signer
     image: consensys/web3signer:23.3-jdk17
-    profiles: [ "l2", "debug", "ci-testing" ]
+    profiles: [ "l2", "debug", "external-to-monorepo" ]
     ports:
       - "9000:9000"
     command:
@@ -325,7 +325,7 @@ services:
     image: postgres:14.5
     hostname: postgres
     container_name: postgres
-    profiles: [ "l2", "debug", "ci-testing" ]
+    profiles: [ "l2", "debug", "external-to-monorepo" ]
     environment:
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
@@ -356,7 +356,7 @@ services:
     container_name: l1-el-node
     hostname: l1-el-node
     image: hyperledger/besu:24.6.0
-    profiles: [ "l1", "debug", "ci-testing" ]
+    profiles: [ "l1", "debug", "external-to-monorepo" ]
     depends_on:
       l1-node-genesis-generator:
           condition: service_completed_successfully
@@ -388,7 +388,7 @@ services:
     container_name: l1-cl-node
     hostname: l1-cl-node
     image: consensys/teku:24.2.0
-    profiles: [ "l1", "debug", "ci-testing" ]
+    profiles: [ "l1", "debug", "external-to-monorepo" ]
     depends_on:
       l1-el-node:
         condition: service_healthy
@@ -414,7 +414,7 @@ services:
   l1-node-genesis-generator:
     build:
       context: ./config/l1-node/
-    profiles: [ "l1", "debug", "ci-testing" ]
+    profiles: [ "l1", "debug", "external-to-monorepo" ]
     entrypoint:
       - /bin/sh
       - -c
@@ -462,7 +462,7 @@ services:
     image: consensys/linea-besu:linea-delivery-27
     hostname: zkbesu-shomei
     container_name: zkbesu-shomei
-    profiles: [ "l2", "l2-bc", "ci-testing" ]
+    profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
     depends_on:
       shomei-plugin-downloader:
         condition: service_completed_successfully
@@ -509,7 +509,7 @@ services:
     image: consensys/linea-shomei:2.2.0
     hostname: shomei
     container_name: shomei
-    profiles: [ "l2", "l2-bc", "ci-testing" ]
+    profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
     depends_on:
       zkbesu-shomei:
         condition: service_started
@@ -545,7 +545,7 @@ services:
     image: consensys/linea-shomei:2.2.0
     hostname: shomei-frontend
     container_name: shomei-frontend
-    profiles: [ "l2", "l2-bc", "ci-testing" ]
+    profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
     depends_on:
       zkbesu-shomei:
         condition: service_started
@@ -586,7 +586,7 @@ services:
 
   shomei-plugin-downloader:
     container_name: shomei-plugin-downloader
-    profiles: [ "l2", "l2-bc", "ci-testing" ]
+    profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
     image: busybox:1.36.1
     command: [ "sh", "/file-downloader.sh", "https://github.com/Consensys/besu-shomei-plugin/releases/download/v0.3.1/besu-shomei-plugin-v0.3.1.jar",  "/shomei-plugin" ]
     volumes: