chore: Renaming things (#772)

* Renaming

* Use unstable

* Fix

* Fix

* Use main
This commit is contained in:
Anatolios Laskaris 2023-07-10 09:40:58 +03:00 committed by GitHub
parent c1fe24b04d
commit a7dba14c7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 56 deletions

View File

@ -1,13 +1,13 @@
networks: networks:
fluence: nox:
driver: bridge driver: bridge
ipam: ipam:
config: config:
- subnet: 10.50.10.0/24 - subnet: 10.50.10.0/24
services: services:
fluence-1: nox-1:
image: ${RUST_PEER_IMAGE} image: ${NOX_IMAGE}
ports: ports:
- 7771:7771 - 7771:7771
- 9991:9991 - 9991:9991
@ -17,19 +17,19 @@ services:
- -w=9991 - -w=9991
- -x=10.50.10.10 - -x=10.50.10.10
- --external-maddrs - --external-maddrs
- /dns4/fluence-1/tcp/7771 - /dns4/nox-1/tcp/7771
- /dns4/fluence-1/tcp/9991/ws - /dns4/nox-1/tcp/9991/ws
- --allow-private-ips - --allow-private-ips
- --local - --local
# - --bootstraps=/dns/fluence-1/tcp/7771 # - --bootstraps=/dns/nox-1/tcp/7771
# 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR
- -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq
networks: networks:
fluence: nox:
ipv4_address: 10.50.10.10 ipv4_address: 10.50.10.10
fluence-2: nox-2:
image: ${RUST_PEER_IMAGE} image: ${NOX_IMAGE}
ports: ports:
- 7772:7772 - 7772:7772
- 9992:9992 - 9992:9992
@ -39,18 +39,18 @@ services:
- -w=9992 - -w=9992
- -x=10.50.10.20 - -x=10.50.10.20
- --external-maddrs - --external-maddrs
- /dns4/fluence-2/tcp/7772 - /dns4/nox-2/tcp/7772
- /dns4/fluence-2/tcp/9992/ws - /dns4/nox-2/tcp/9992/ws
- --allow-private-ips - --allow-private-ips
- --bootstraps=/dns/fluence-1/tcp/7771 - --bootstraps=/dns/nox-1/tcp/7771
# 12D3KooWQdpukY3p2DhDfUfDgphAqsGu5ZUrmQ4mcHSGrRag6gQK # 12D3KooWQdpukY3p2DhDfUfDgphAqsGu5ZUrmQ4mcHSGrRag6gQK
- -k=2WijTVdhVRzyZamWjqPx4V4iNMrajegNMwNa2PmvPSZV6RRpo5M2fsPWdQr22HVRubuJhhSw8BrWiGt6FPhFAuXy - -k=2WijTVdhVRzyZamWjqPx4V4iNMrajegNMwNa2PmvPSZV6RRpo5M2fsPWdQr22HVRubuJhhSw8BrWiGt6FPhFAuXy
networks: networks:
fluence: nox:
ipv4_address: 10.50.10.20 ipv4_address: 10.50.10.20
fluence-3: nox-3:
image: ${RUST_PEER_IMAGE} image: ${NOX_IMAGE}
ports: ports:
- 7773:7773 - 7773:7773
- 9993:9993 - 9993:9993
@ -60,18 +60,18 @@ services:
- -w=9993 - -w=9993
- -x=10.50.10.30 - -x=10.50.10.30
- --external-maddrs - --external-maddrs
- /dns4/fluence-3/tcp/7773 - /dns4/nox-3/tcp/7773
- /dns4/fluence-3/tcp/9993/ws - /dns4/nox-3/tcp/9993/ws
- --allow-private-ips - --allow-private-ips
- --bootstraps=/dns/fluence-1/tcp/7771 - --bootstraps=/dns/nox-1/tcp/7771
# 12D3KooWRT8V5awYdEZm6aAV9HWweCEbhWd7df4wehqHZXAB7yMZ # 12D3KooWRT8V5awYdEZm6aAV9HWweCEbhWd7df4wehqHZXAB7yMZ
- -k=2n2wBVanBeu2GWtvKBdrYK9DJAocgG3PrTUXMharq6TTfxqTL4sLdXL9BF23n6rsnkAY5pR9vBtx2uWYDQAiZdrX - -k=2n2wBVanBeu2GWtvKBdrYK9DJAocgG3PrTUXMharq6TTfxqTL4sLdXL9BF23n6rsnkAY5pR9vBtx2uWYDQAiZdrX
networks: networks:
fluence: nox:
ipv4_address: 10.50.10.30 ipv4_address: 10.50.10.30
fluence-4: nox-4:
image: ${RUST_PEER_IMAGE} image: ${NOX_IMAGE}
ports: ports:
- 7774:7774 - 7774:7774
- 9994:9994 - 9994:9994
@ -81,18 +81,18 @@ services:
- -w=9994 - -w=9994
- -x=10.50.10.40 - -x=10.50.10.40
- --external-maddrs - --external-maddrs
- /dns4/fluence-4/tcp/7774 - /dns4/nox-4/tcp/7774
- /dns4/fluence-4/tcp/9994/ws - /dns4/nox-4/tcp/9994/ws
- --allow-private-ips - --allow-private-ips
- --bootstraps=/dns/fluence-1/tcp/7771 - --bootstraps=/dns/nox-1/tcp/7771
# 12D3KooWBzLSu9RL7wLP6oUowzCbkCj2AGBSXkHSJKuq4wwTfwof # 12D3KooWBzLSu9RL7wLP6oUowzCbkCj2AGBSXkHSJKuq4wwTfwof
- -k=4zp8ucAikkjB8CmkufYiFBW4QCDUCbQG7yMjviX7W8bMyN5rfChQ2Pi5QCWThrCTbAm9uq5nbFbxtFcNZq3De4dX - -k=4zp8ucAikkjB8CmkufYiFBW4QCDUCbQG7yMjviX7W8bMyN5rfChQ2Pi5QCWThrCTbAm9uq5nbFbxtFcNZq3De4dX
networks: networks:
fluence: nox:
ipv4_address: 10.50.10.40 ipv4_address: 10.50.10.40
fluence-5: nox-5:
image: ${RUST_PEER_IMAGE} image: ${NOX_IMAGE}
ports: ports:
- 7775:7775 - 7775:7775
- 9995:9995 - 9995:9995
@ -102,18 +102,18 @@ services:
- -w=9995 - -w=9995
- -x=10.50.10.50 - -x=10.50.10.50
- --external-maddrs - --external-maddrs
- /dns4/fluence-5/tcp/7775 - /dns4/nox-5/tcp/7775
- /dns4/fluence-5/tcp/9995/ws - /dns4/nox-5/tcp/9995/ws
- --allow-private-ips - --allow-private-ips
- --bootstraps=/dns/fluence-1/tcp/7771 - --bootstraps=/dns/nox-1/tcp/7771
# 12D3KooWBf6hFgrnXwHkBnwPGMysP3b1NJe5HGtAWPYfwmQ2MBiU # 12D3KooWBf6hFgrnXwHkBnwPGMysP3b1NJe5HGtAWPYfwmQ2MBiU
- -k=3ry26rm5gkJXvdqRH4FoM3ezWq4xVVsBQF7wtKq4E4pbuaa6p1F84tNqifUS7DdfJL9hs2gcdW64Wc342vHZHMUp - -k=3ry26rm5gkJXvdqRH4FoM3ezWq4xVVsBQF7wtKq4E4pbuaa6p1F84tNqifUS7DdfJL9hs2gcdW64Wc342vHZHMUp
networks: networks:
fluence: nox:
ipv4_address: 10.50.10.50 ipv4_address: 10.50.10.50
fluence-6: nox-6:
image: ${RUST_PEER_IMAGE} image: ${NOX_IMAGE}
ports: ports:
- 7776:7776 - 7776:7776
- 9996:9996 - 9996:9996
@ -121,14 +121,14 @@ services:
- --aqua-pool-size=2 - --aqua-pool-size=2
- -t=7776 - -t=7776
- -w=9996 - -w=9996
- --bootstraps=/dns/fluence-1/tcp/7771 - --bootstraps=/dns/nox-1/tcp/7771
- -x=10.50.10.60 - -x=10.50.10.60
- --external-maddrs - --external-maddrs
- /dns4/fluence-6/tcp/7776 - /dns4/nox-6/tcp/7776
- /dns4/fluence-6/tcp/9996/ws - /dns4/nox-6/tcp/9996/ws
- --allow-private-ips - --allow-private-ips
# 12D3KooWPisGn7JhooWhggndz25WM7vQ2JmA121EV8jUDQ5xMovJ # 12D3KooWPisGn7JhooWhggndz25WM7vQ2JmA121EV8jUDQ5xMovJ
- -k=5Qh8bB1sF28uLPwr3HTvEksCeC6mAWQvebCfcgv9y6j4qKwSzNKm2tzLUg4nACUEo2KZpBw11gNCnwaAdM7o1pEn - -k=5Qh8bB1sF28uLPwr3HTvEksCeC6mAWQvebCfcgv9y6j4qKwSzNKm2tzLUg4nACUEo2KZpBw11gNCnwaAdM7o1pEn
networks: networks:
fluence: nox:
ipv4_address: 10.50.10.60 ipv4_address: 10.50.10.60

View File

@ -35,14 +35,14 @@ jobs:
with: with:
ref: ${{ github.ref }} ref: ${{ github.ref }}
fluence-cli-snapshot: flox-snapshot:
name: "fluence-cli" name: "flox"
needs: aqua needs: aqua
uses: fluencelabs/fluence-cli/.github/workflows/snapshot.yml@main uses: fluencelabs/flox/.github/workflows/snapshot.yml@main
with: with:
aqua-snapshots: "${{ needs.aqua.outputs.aqua-snapshots }}" aqua-snapshots: "${{ needs.aqua.outputs.aqua-snapshots }}"
fluence-cli: flox:
needs: aqua needs: aqua
uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@main uses: fluencelabs/fluence-cli/.github/workflows/tests.yml@main
with: with:
@ -50,9 +50,7 @@ jobs:
registry: registry:
needs: needs:
- aqua - flox-snapshot
- fluence-cli-snapshot
uses: fluencelabs/registry/.github/workflows/tests.yml@main uses: fluencelabs/registry/.github/workflows/tests.yml@main
with: with:
aqua-snapshots: "${{ needs.aqua.outputs.aqua-snapshots }}" flox-version: "${{ needs.flox-snapshot.outputs.version }}"
fluence-cli-version: "${{ needs.fluence-cli-snapshot.outputs.version }}"

View File

@ -11,8 +11,8 @@ on:
description: "Fluence enviroment to run tests agains" description: "Fluence enviroment to run tests agains"
type: string type: string
default: "local" default: "local"
rust-peer-image: nox-image:
description: "rust-peer image tag" description: "nox image tag"
type: string type: string
default: "fluencelabs/nox:unstable_minimal" default: "fluencelabs/nox:unstable_minimal"
js-client-snapshots: js-client-snapshots:
@ -22,7 +22,7 @@ on:
env: env:
FORCE_COLOR: true FORCE_COLOR: true
RUST_PEER_IMAGE: "${{ inputs.rust-peer-image }}" NOX_IMAGE: "${{ inputs.nox-image }}"
FLUENCE_ENV: "${{ inputs.fluence-env }}" FLUENCE_ENV: "${{ inputs.fluence-env }}"
jobs: jobs:
@ -64,10 +64,10 @@ jobs:
repository: fluencelabs/aqua repository: fluencelabs/aqua
ref: ${{ inputs.ref }} ref: ${{ inputs.ref }}
- name: Pull rust-peer image - name: Pull nox image
run: docker pull $RUST_PEER_IMAGE run: docker pull $NOX_IMAGE
- name: Run rust-peer - name: Run nox
uses: isbang/compose-action@v1.4.1 uses: isbang/compose-action@v1.4.1
with: with:
compose-file: ".github/e2e/docker-compose.yml" compose-file: ".github/e2e/docker-compose.yml"
@ -120,6 +120,6 @@ jobs:
- run: pnpm run test - run: pnpm run test
working-directory: integration-tests working-directory: integration-tests
- name: Dump rust-peer logs - name: Dump nox logs
if: always() if: always()
uses: jwalton/gh-docker-logs@v2 uses: jwalton/gh-docker-logs@v2

View File

@ -86,14 +86,14 @@ export const localConfig = {
externalAddressesRelay1: [ externalAddressesRelay1: [
"/ip4/10.50.10.10/tcp/7771", "/ip4/10.50.10.10/tcp/7771",
"/ip4/10.50.10.10/tcp/9991/ws", "/ip4/10.50.10.10/tcp/9991/ws",
"/dns4/fluence-1/tcp/7771", "/dns4/nox-1/tcp/7771",
"/dns4/fluence-1/tcp/9991/ws", "/dns4/nox-1/tcp/9991/ws",
], ],
externalAddressesRelay2: [ externalAddressesRelay2: [
"/ip4/10.50.10.60/tcp/7776", "/ip4/10.50.10.60/tcp/7776",
"/ip4/10.50.10.60/tcp/9996/ws", "/ip4/10.50.10.60/tcp/9996/ws",
"/dns4/fluence-6/tcp/7776", "/dns4/nox-6/tcp/7776",
"/dns4/fluence-6/tcp/9996/ws", "/dns4/nox-6/tcp/9996/ws",
], ],
tryCatchError: tryCatchError:
"Local service error, ret_code is 1, error message is '\"Service with id 'unex' not found (function getStr)\"'", "Local service error, ret_code is 1, error message is '\"Service with id 'unex' not found (function getStr)\"'",