chore(test-suite): rename fhevm docker images (#65)

tawadaa · web-flow · commit 0f8fd22c21d5 · 2025-05-23T19:17:19.000+02:00
diff --git a/.github/workflows/test-suite-e2e-tests.yml b/.github/workflows/test-suite-e2e-tests.yml
@@ -1,15 +1,15 @@
-name: Fhevm Test Suite E2E Tests
+name: Test Suite E2E Tests
 
 on:
   workflow_dispatch:
     inputs:
-      core_version:
-        description: "KMS Core Version"
+      gateway_version:
+        description: "Gateway Image Version"
         required: true
         default: ""
         type: string
-      connector_version:
-        description: "Connector Version"
+      host_version:
+        description: "Host Image Version"
         required: true
         default: ""
         type: string
@@ -23,27 +23,30 @@ on:
         required: true
         default: ""
         type: string
-      host_version:
-        description: "Host Image Version"
-        required: false
+      connector_version:
+        description: "Connector Version"
+        required: true
         default: ""
         type: string
-      gateway_version:
-        description: "Gateway Image Version"
-        required: false
+      test_suite_version:
+        description: "Test Suite E2E Image Version"
+        required: true
         default: ""
         type: string
-      relayer_version:
-        description: "Relayer Image Version"
+      core_version:
+        description: "KMS Core Version"
         required: true
         default: ""
         type: string
-      test_suite_version:
-        description: "Test Suite E2E Image Version"
+      relayer_version:
+        description: "Relayer Image Version"
         required: true
         default: ""
         type: string
   pull_request:
+  release:
+    types:
+      - published
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -68,7 +71,7 @@ jobs:
               - 'test-suite/fhevm/**'
   fhevm-e2e-test:
     needs: check-changes
-    if: ${{ needs.check-changes.outputs.changes-fhevm == 'true' || github.event_name == 'release' }}
+    if: ${{ needs.check-changes.outputs.changes-fhevm == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
     permissions:
       contents: "read"
       id-token: "write"
@@ -89,17 +92,29 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_READ_TOKEN }}
 
+      - name: Set version from release
+        if: github.event_name == 'release'
+        run: |
+          {
+            echo "GATEWAY_VERSION=${{ github.ref_name }}"
+            echo "HOST_VERSION=${{ github.ref_name }}"
+            echo "COPROCESSOR_VERSION=${{ github.ref_name }}"
+            echo "DB_MIGRATION_VERSION=${{ github.ref_name }}"
+            echo "CONNECTOR_VERSION=${{ github.ref_name }}"
+            echo "TEST_SUITE_VERSION=${{ github.ref_name }}"
+          } >> "$GITHUB_ENV"
+
       - name: Deploy fhevm Stack
         working-directory: test-suite/fhevm
         env:
+          GATEWAY_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.gateway_version || env.GATEWAY_VERSION }}
+          HOST_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.host_version || env.HOST_VERSION }}
+          COPROCESSOR_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.coprocessor_version || env.COPROCESSOR_VERSION }}
+          DB_MIGRATION_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.db_migration_version || env.DB_MIGRATION_VERSION }}
+          CONNECTOR_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.connector_version || env.CONNECTOR_VERSION }}
+          TEST_SUITE_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.test_suite_version || env.TEST_SUITE_VERSION }}
           CORE_VERSION: ${{ inputs.core_version }}
-          CONNECTOR_VERSION: ${{ inputs.connector_version }}
-          COPROCESSOR_VERSION: ${{ inputs.coprocessor_version }}
-          DB_MIGRATION_VERSION: ${{ inputs.db_migration_version }}
-          HOST_VERSION: ${{ inputs.host_version }}
-          GATEWAY_VERSION: ${{ inputs.gateway_version }}
           RELAYER_VERSION: ${{ inputs.relayer_version }}
-          TEST_SUITE_VERSION: ${{ inputs.test_suite_version }}
         run: |
           ./fhevm-cli deploy
 
@@ -151,4 +166,4 @@ jobs:
         working-directory: test-suite/fhevm
         if: always()
         run: |
-          ./fhevm-cli clean
+          ./fhevm-cli clean
diff --git a/test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml b/test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml
@@ -34,7 +34,7 @@ services:
 
   db-migration:
     container_name: fhevm-db-migration
-    image: ghcr.io/zama-ai/fhevm-backend/db-migration:${DB_MIGRATION_VERSION}
+    image: ghcr.io/zama-ai/fhevm/coprocessor/db-migration:${DB_MIGRATION_VERSION}
     env_file:
       - ../env/staging/.env.coprocessor.local
     environment:
@@ -50,7 +50,7 @@ services:
   ####################### COPROCESSOR SERVICES #######################
   fhevm-listener:
     container_name: fhevm-fhevm-listener
-    image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
+    image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
     env_file:
       - ../env/staging/.env.coprocessor.local
     command:
@@ -66,7 +66,7 @@ services:
 
   gw-listener:
     container_name: fhevm-gw-listener
-    image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
+    image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
     env_file:
       - ../env/staging/.env.coprocessor.local
     command:
@@ -83,7 +83,7 @@ services:
 
   tfhe-worker:
     container_name: fhevm-tfhe-worker
-    image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
+    image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
     env_file:
       - ../env/staging/.env.coprocessor.local
     command:
@@ -104,7 +104,7 @@ services:
 
   zkproof-worker:
     container_name: fhevm-zkproof-worker
-    image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
+    image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
     env_file:
       - ../env/staging/.env.coprocessor.local
     command:
@@ -123,7 +123,7 @@ services:
 
   sns-worker:
     container_name: fhevm-sns-worker
-    image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
+    image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
     env_file:
       - ../env/staging/.env.coprocessor.local
     command:
@@ -145,7 +145,7 @@ services:
 
   transaction-sender:
     container_name: fhevm-transaction-sender
-    image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
+    image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
     env_file:
       - ../env/staging/.env.coprocessor.local
     command:
diff --git a/test-suite/fhevm/docker-compose/gateway-docker-compose.yml b/test-suite/fhevm/docker-compose/gateway-docker-compose.yml
@@ -23,7 +23,7 @@ services:
 
   gateway-sc-deploy:
     container_name: fhevm-gateway-sc-deploy
-    image: ghcr.io/zama-ai/fhevm-gateway/contracts:${GATEWAY_VERSION}
+    image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
     env_file:
       - ../env/staging/.env.gateway.local
     command:
@@ -34,7 +34,7 @@ services:
 
   gateway-sc-add-network:
     container_name: fhevm-gateway-sc-add-network
-    image: ghcr.io/zama-ai/fhevm-gateway/contracts:${GATEWAY_VERSION}
+    image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
     env_file:
       - ../env/staging/.env.gateway.local
     command:
diff --git a/test-suite/fhevm/docker-compose/host-docker-compose.yml b/test-suite/fhevm/docker-compose/host-docker-compose.yml
@@ -23,7 +23,7 @@ services:
 
   host-sc-deploy:
     container_name: fhevm-host-sc-deploy
-    image: ghcr.io/zama-ai/fhevm-backend/contracts:${HOST_VERSION}
+    image: ghcr.io/zama-ai/fhevm/host-contracts:${HOST_VERSION}
     env_file:
       - ../env/staging/.env.host.local
     command:
diff --git a/test-suite/fhevm/fhevm-cli b/test-suite/fhevm/fhevm-cli
@@ -17,14 +17,14 @@ RESET='\033[0m'
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROJECT="fhevm"
 
-export CORE_VERSION=${CORE_VERSION:-"v0.11.0-rc13"}
+export GATEWAY_VERSION=${GATEWAY_VERSION:-"9eb4879"}
+export HOST_VERSION=${HOST_VERSION:-"f60c9e5"}
+export COPROCESSOR_VERSION=${COPROCESSOR_VERSION:-"e15a09b"}
+export DB_MIGRATION_VERSION=${DB_MIGRATION_VERSION:-"b094bf8"}
 export CONNECTOR_VERSION=${CONNECTOR_VERSION:-"v0.1.0-rc6"}
-export COPROCESSOR_VERSION=${COPROCESSOR_VERSION:-"v0.7.0-rc8"}
-export DB_MIGRATION_VERSION=${DB_MIGRATION_VERSION:-"v0.7.0-rc8"}
-export HOST_VERSION=${HOST_VERSION:-"31c51c3"}
-export GATEWAY_VERSION=${GATEWAY_VERSION:-"5d13e72"}
+export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"b46cd1b"}
+export CORE_VERSION=${CORE_VERSION:-"v0.11.0-rc14"}
 export RELAYER_VERSION=${RELAYER_VERSION:-"v0.1.0-rc8"}
-export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"21d915a"}
 
 function print_logo() {
   echo -e "${LIGHT_BLUE}"
diff --git a/test-suite/fhevm/scripts/deploy-fhevm-stack.sh b/test-suite/fhevm/scripts/deploy-fhevm-stack.sh
@@ -200,14 +200,14 @@ prepare_local_config_relayer
 
 log_info "Deploying FHEVM Stack..."
 log_info "Using component versions:"
-log_info "  KMS CORE:${CORE_VERSION}"
-log_info "  KMS CONNECTOR: ${CONNECTOR_VERSION}"
-log_info "  COPROCESSOR: ${COPROCESSOR_VERSION}"
-log_info "  DB MIGRATION: ${DB_MIGRATION_VERSION}"
-log_info "  GATEWAY: ${GATEWAY_VERSION}"
-log_info "  HOST: ${HOST_VERSION}"
+log_info "  FHEVM GATEWAY: ${GATEWAY_VERSION}"
+log_info "  FHEVM HOST: ${HOST_VERSION}"
+log_info "  FHEVM COPROCESSOR: ${COPROCESSOR_VERSION}"
+log_info "  FHEVM DB MIGRATION: ${DB_MIGRATION_VERSION}"
+log_info "  FHEVM KMS CONNECTOR: ${CONNECTOR_VERSION}"
+log_info "  FHEVM TEST SUITE: ${TEST_SUITE_VERSION}"
+log_info "  KMS CORE: ${CORE_VERSION}"
 log_info "  RELAYER: ${RELAYER_VERSION}"
-log_info "  TEST SUITE: ${TEST_SUITE_VERSION}"
 
 run_compose "minio" "MinIO Services" \
     "${PROJECT}-minio:running" \
