Skip to content

Commit 0f8fd22

Browse files
tawadaatawadaa
authored
chore(test-suite): rename fhevm docker images (#65)
1 parent b46cd1b commit 0f8fd22

6 files changed

Lines changed: 61 additions & 46 deletions

File tree

‎.github/workflows/test-suite-e2e-tests.yml‎

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
name: Fhevm Test Suite E2E Tests
1+
name: Test Suite E2E Tests
22

33
on:
44
workflow_dispatch:
55
inputs:
6-
core_version:
7-
description: "KMS Core Version"
6+
gateway_version:
7+
description: "Gateway Image Version"
88
required: true
99
default: ""
1010
type: string
11-
connector_version:
12-
description: "Connector Version"
11+
host_version:
12+
description: "Host Image Version"
1313
required: true
1414
default: ""
1515
type: string
@@ -23,27 +23,30 @@ on:
2323
required: true
2424
default: ""
2525
type: string
26-
host_version:
27-
description: "Host Image Version"
28-
required: false
26+
connector_version:
27+
description: "Connector Version"
28+
required: true
2929
default: ""
3030
type: string
31-
gateway_version:
32-
description: "Gateway Image Version"
33-
required: false
31+
test_suite_version:
32+
description: "Test Suite E2E Image Version"
33+
required: true
3434
default: ""
3535
type: string
36-
relayer_version:
37-
description: "Relayer Image Version"
36+
core_version:
37+
description: "KMS Core Version"
3838
required: true
3939
default: ""
4040
type: string
41-
test_suite_version:
42-
description: "Test Suite E2E Image Version"
41+
relayer_version:
42+
description: "Relayer Image Version"
4343
required: true
4444
default: ""
4545
type: string
4646
pull_request:
47+
release:
48+
types:
49+
- published
4750

4851
concurrency:
4952
group: ${{ github.workflow }}-${{ github.ref }}
@@ -68,7 +71,7 @@ jobs:
6871
- 'test-suite/fhevm/**'
6972
fhevm-e2e-test:
7073
needs: check-changes
71-
if: ${{ needs.check-changes.outputs.changes-fhevm == 'true' || github.event_name == 'release' }}
74+
if: ${{ needs.check-changes.outputs.changes-fhevm == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }}
7275
permissions:
7376
contents: "read"
7477
id-token: "write"
@@ -89,17 +92,29 @@ jobs:
8992
username: ${{ github.actor }}
9093
password: ${{ secrets.GHCR_READ_TOKEN }}
9194

95+
- name: Set version from release
96+
if: github.event_name == 'release'
97+
run: |
98+
{
99+
echo "GATEWAY_VERSION=${{ github.ref_name }}"
100+
echo "HOST_VERSION=${{ github.ref_name }}"
101+
echo "COPROCESSOR_VERSION=${{ github.ref_name }}"
102+
echo "DB_MIGRATION_VERSION=${{ github.ref_name }}"
103+
echo "CONNECTOR_VERSION=${{ github.ref_name }}"
104+
echo "TEST_SUITE_VERSION=${{ github.ref_name }}"
105+
} >> "$GITHUB_ENV"
106+
92107
- name: Deploy fhevm Stack
93108
working-directory: test-suite/fhevm
94109
env:
110+
GATEWAY_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.gateway_version || env.GATEWAY_VERSION }}
111+
HOST_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.host_version || env.HOST_VERSION }}
112+
COPROCESSOR_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.coprocessor_version || env.COPROCESSOR_VERSION }}
113+
DB_MIGRATION_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.db_migration_version || env.DB_MIGRATION_VERSION }}
114+
CONNECTOR_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.connector_version || env.CONNECTOR_VERSION }}
115+
TEST_SUITE_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.test_suite_version || env.TEST_SUITE_VERSION }}
95116
CORE_VERSION: ${{ inputs.core_version }}
96-
CONNECTOR_VERSION: ${{ inputs.connector_version }}
97-
COPROCESSOR_VERSION: ${{ inputs.coprocessor_version }}
98-
DB_MIGRATION_VERSION: ${{ inputs.db_migration_version }}
99-
HOST_VERSION: ${{ inputs.host_version }}
100-
GATEWAY_VERSION: ${{ inputs.gateway_version }}
101117
RELAYER_VERSION: ${{ inputs.relayer_version }}
102-
TEST_SUITE_VERSION: ${{ inputs.test_suite_version }}
103118
run: |
104119
./fhevm-cli deploy
105120
@@ -151,4 +166,4 @@ jobs:
151166
working-directory: test-suite/fhevm
152167
if: always()
153168
run: |
154-
./fhevm-cli clean
169+
./fhevm-cli clean

‎test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434
3535
db-migration:
3636
container_name: fhevm-db-migration
37-
image: ghcr.io/zama-ai/fhevm-backend/db-migration:${DB_MIGRATION_VERSION}
37+
image: ghcr.io/zama-ai/fhevm/coprocessor/db-migration:${DB_MIGRATION_VERSION}
3838
env_file:
3939
- ../env/staging/.env.coprocessor.local
4040
environment:
@@ -50,7 +50,7 @@ services:
5050
####################### COPROCESSOR SERVICES #######################
5151
fhevm-listener:
5252
container_name: fhevm-fhevm-listener
53-
image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
53+
image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
5454
env_file:
5555
- ../env/staging/.env.coprocessor.local
5656
command:
@@ -66,7 +66,7 @@ services:
6666

6767
gw-listener:
6868
container_name: fhevm-gw-listener
69-
image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
69+
image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
7070
env_file:
7171
- ../env/staging/.env.coprocessor.local
7272
command:
@@ -83,7 +83,7 @@ services:
8383

8484
tfhe-worker:
8585
container_name: fhevm-tfhe-worker
86-
image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
86+
image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
8787
env_file:
8888
- ../env/staging/.env.coprocessor.local
8989
command:
@@ -104,7 +104,7 @@ services:
104104

105105
zkproof-worker:
106106
container_name: fhevm-zkproof-worker
107-
image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
107+
image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
108108
env_file:
109109
- ../env/staging/.env.coprocessor.local
110110
command:
@@ -123,7 +123,7 @@ services:
123123

124124
sns-worker:
125125
container_name: fhevm-sns-worker
126-
image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
126+
image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
127127
env_file:
128128
- ../env/staging/.env.coprocessor.local
129129
command:
@@ -145,7 +145,7 @@ services:
145145

146146
transaction-sender:
147147
container_name: fhevm-transaction-sender
148-
image: ghcr.io/zama-ai/fhevm-backend/coprocessor:${COPROCESSOR_VERSION}
148+
image: ghcr.io/zama-ai/fhevm/coprocessor:${COPROCESSOR_VERSION}
149149
env_file:
150150
- ../env/staging/.env.coprocessor.local
151151
command:

‎test-suite/fhevm/docker-compose/gateway-docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323

2424
gateway-sc-deploy:
2525
container_name: fhevm-gateway-sc-deploy
26-
image: ghcr.io/zama-ai/fhevm-gateway/contracts:${GATEWAY_VERSION}
26+
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
2727
env_file:
2828
- ../env/staging/.env.gateway.local
2929
command:
@@ -34,7 +34,7 @@ services:
3434

3535
gateway-sc-add-network:
3636
container_name: fhevm-gateway-sc-add-network
37-
image: ghcr.io/zama-ai/fhevm-gateway/contracts:${GATEWAY_VERSION}
37+
image: ghcr.io/zama-ai/fhevm/gateway-contracts:${GATEWAY_VERSION}
3838
env_file:
3939
- ../env/staging/.env.gateway.local
4040
command:

‎test-suite/fhevm/docker-compose/host-docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323

2424
host-sc-deploy:
2525
container_name: fhevm-host-sc-deploy
26-
image: ghcr.io/zama-ai/fhevm-backend/contracts:${HOST_VERSION}
26+
image: ghcr.io/zama-ai/fhevm/host-contracts:${HOST_VERSION}
2727
env_file:
2828
- ../env/staging/.env.host.local
2929
command:

‎test-suite/fhevm/fhevm-cli‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ RESET='\033[0m'
1717
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1818
PROJECT="fhevm"
1919

20-
export CORE_VERSION=${CORE_VERSION:-"v0.11.0-rc13"}
20+
export GATEWAY_VERSION=${GATEWAY_VERSION:-"9eb4879"}
21+
export HOST_VERSION=${HOST_VERSION:-"f60c9e5"}
22+
export COPROCESSOR_VERSION=${COPROCESSOR_VERSION:-"e15a09b"}
23+
export DB_MIGRATION_VERSION=${DB_MIGRATION_VERSION:-"b094bf8"}
2124
export CONNECTOR_VERSION=${CONNECTOR_VERSION:-"v0.1.0-rc6"}
22-
export COPROCESSOR_VERSION=${COPROCESSOR_VERSION:-"v0.7.0-rc8"}
23-
export DB_MIGRATION_VERSION=${DB_MIGRATION_VERSION:-"v0.7.0-rc8"}
24-
export HOST_VERSION=${HOST_VERSION:-"31c51c3"}
25-
export GATEWAY_VERSION=${GATEWAY_VERSION:-"5d13e72"}
25+
export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"b46cd1b"}
26+
export CORE_VERSION=${CORE_VERSION:-"v0.11.0-rc14"}
2627
export RELAYER_VERSION=${RELAYER_VERSION:-"v0.1.0-rc8"}
27-
export TEST_SUITE_VERSION=${TEST_SUITE_VERSION:-"21d915a"}
2828

2929
function print_logo() {
3030
echo -e "${LIGHT_BLUE}"

‎test-suite/fhevm/scripts/deploy-fhevm-stack.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ prepare_local_config_relayer
200200

201201
log_info "Deploying FHEVM Stack..."
202202
log_info "Using component versions:"
203-
log_info " KMS CORE:${CORE_VERSION}"
204-
log_info " KMS CONNECTOR: ${CONNECTOR_VERSION}"
205-
log_info " COPROCESSOR: ${COPROCESSOR_VERSION}"
206-
log_info " DB MIGRATION: ${DB_MIGRATION_VERSION}"
207-
log_info " GATEWAY: ${GATEWAY_VERSION}"
208-
log_info " HOST: ${HOST_VERSION}"
203+
log_info " FHEVM GATEWAY: ${GATEWAY_VERSION}"
204+
log_info " FHEVM HOST: ${HOST_VERSION}"
205+
log_info " FHEVM COPROCESSOR: ${COPROCESSOR_VERSION}"
206+
log_info " FHEVM DB MIGRATION: ${DB_MIGRATION_VERSION}"
207+
log_info " FHEVM KMS CONNECTOR: ${CONNECTOR_VERSION}"
208+
log_info " FHEVM TEST SUITE: ${TEST_SUITE_VERSION}"
209+
log_info " KMS CORE: ${CORE_VERSION}"
209210
log_info " RELAYER: ${RELAYER_VERSION}"
210-
log_info " TEST SUITE: ${TEST_SUITE_VERSION}"
211211

212212
run_compose "minio" "MinIO Services" \
213213
"${PROJECT}-minio:running" \

0 commit comments

Comments
 (0)