diff --git a/.github/e2e/docker-compose.yml b/.github/e2e/docker-compose.yml deleted file mode 100644 index 7339b56..0000000 --- a/.github/e2e/docker-compose.yml +++ /dev/null @@ -1,134 +0,0 @@ -networks: - nox: - driver: bridge - ipam: - config: - - subnet: 10.50.10.0/24 - -services: - nox-1: - image: ${NOX_IMAGE} - ports: - - 7771:7771 - - 9991:9991 - command: - - --aqua-pool-size=2 - - -t=7771 - - -w=9991 - - -x=10.50.10.10 - - --external-maddrs - - /dns4/nox-1/tcp/7771 - - /dns4/nox-1/tcp/9991/ws - - --allow-private-ips - - --local - # - --bootstraps=/dns/nox-1/tcp/7771 - # 12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR - - -k=hK62afickoeP2uZbmSkAYXxxqP8ozq16VRN7qfTP719EHC5V5tjrtW57BSjUr8GvsEXmJRbtejUWyPZ2rZMyQdq - networks: - nox: - ipv4_address: 10.50.10.10 - - nox-2: - image: ${NOX_IMAGE} - ports: - - 7772:7772 - - 9992:9992 - command: - - --aqua-pool-size=2 - - -t=7772 - - -w=9992 - - -x=10.50.10.20 - - --external-maddrs - - /dns4/nox-2/tcp/7772 - - /dns4/nox-2/tcp/9992/ws - - --allow-private-ips - - --bootstraps=/dns/nox-1/tcp/7771 - # 12D3KooWQdpukY3p2DhDfUfDgphAqsGu5ZUrmQ4mcHSGrRag6gQK - - -k=2WijTVdhVRzyZamWjqPx4V4iNMrajegNMwNa2PmvPSZV6RRpo5M2fsPWdQr22HVRubuJhhSw8BrWiGt6FPhFAuXy - networks: - nox: - ipv4_address: 10.50.10.20 - - nox-3: - image: ${NOX_IMAGE} - ports: - - 7773:7773 - - 9993:9993 - command: - - --aqua-pool-size=2 - - -t=7773 - - -w=9993 - - -x=10.50.10.30 - - --external-maddrs - - /dns4/nox-3/tcp/7773 - - /dns4/nox-3/tcp/9993/ws - - --allow-private-ips - - --bootstraps=/dns/nox-1/tcp/7771 - # 12D3KooWRT8V5awYdEZm6aAV9HWweCEbhWd7df4wehqHZXAB7yMZ - - -k=2n2wBVanBeu2GWtvKBdrYK9DJAocgG3PrTUXMharq6TTfxqTL4sLdXL9BF23n6rsnkAY5pR9vBtx2uWYDQAiZdrX - networks: - nox: - ipv4_address: 10.50.10.30 - - nox-4: - image: ${NOX_IMAGE} - ports: - - 7774:7774 - - 9994:9994 - command: - - --aqua-pool-size=2 - - -t=7774 - - -w=9994 - - -x=10.50.10.40 - - --external-maddrs - - /dns4/nox-4/tcp/7774 - - /dns4/nox-4/tcp/9994/ws - - --allow-private-ips - - --bootstraps=/dns/nox-1/tcp/7771 - # 12D3KooWBzLSu9RL7wLP6oUowzCbkCj2AGBSXkHSJKuq4wwTfwof - - -k=4zp8ucAikkjB8CmkufYiFBW4QCDUCbQG7yMjviX7W8bMyN5rfChQ2Pi5QCWThrCTbAm9uq5nbFbxtFcNZq3De4dX - networks: - nox: - ipv4_address: 10.50.10.40 - - nox-5: - image: ${NOX_IMAGE} - ports: - - 7775:7775 - - 9995:9995 - command: - - --aqua-pool-size=2 - - -t=7775 - - -w=9995 - - -x=10.50.10.50 - - --external-maddrs - - /dns4/nox-5/tcp/7775 - - /dns4/nox-5/tcp/9995/ws - - --allow-private-ips - - --bootstraps=/dns/nox-1/tcp/7771 - # 12D3KooWBf6hFgrnXwHkBnwPGMysP3b1NJe5HGtAWPYfwmQ2MBiU - - -k=3ry26rm5gkJXvdqRH4FoM3ezWq4xVVsBQF7wtKq4E4pbuaa6p1F84tNqifUS7DdfJL9hs2gcdW64Wc342vHZHMUp - networks: - nox: - ipv4_address: 10.50.10.50 - - nox-6: - image: ${NOX_IMAGE} - ports: - - 7776:7776 - - 9996:9996 - command: - - --aqua-pool-size=2 - - -t=7776 - - -w=9996 - - --bootstraps=/dns/nox-1/tcp/7771 - - -x=10.50.10.60 - - --external-maddrs - - /dns4/nox-6/tcp/7776 - - /dns4/nox-6/tcp/9996/ws - - --allow-private-ips - # 12D3KooWPisGn7JhooWhggndz25WM7vQ2JmA121EV8jUDQ5xMovJ - - -k=5Qh8bB1sF28uLPwr3HTvEksCeC6mAWQvebCfcgv9y6j4qKwSzNKm2tzLUg4nACUEo2KZpBw11gNCnwaAdM7o1pEn - networks: - nox: - ipv4_address: 10.50.10.60 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b772d61..afeba54 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ on: fcli-version: description: "@fluencelabs/cli version" type: string - default: "main" + default: "unstable" if-no-artifacts-found: description: "What to do when no artifacts found in setup-* actions" type: string @@ -30,8 +30,8 @@ on: env: CI: true FORCE_COLOR: true - NOX_IMAGE: "${{ inputs.nox-image }}" FLUENCE_ENV: "${{ inputs.fluence-env }}" + FCLI_V_NOX: "${{ inputs.nox-image }}" jobs: aqua: @@ -113,22 +113,6 @@ jobs: FLUENCE_USER_DIR: "${{ github.workspace }}/tmp/.fluence" run: ./build.sh - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - registry: docker.fluence.dev - username: ${{ env.DOCKER_USERNAME }} - password: ${{ env.DOCKER_PASSWORD }} - - - name: Pull nox image - run: docker pull $NOX_IMAGE - - - name: Run nox network - uses: isbang/compose-action@v1.4.1 - with: - compose-file: ".github/e2e/docker-compose.yml" - down-flags: "--volumes" - - name: Setup python uses: actions/setup-python@v4 with: @@ -146,6 +130,10 @@ jobs: run: fluence dep i --no-input working-directory: aqua-tests + - name: Run nox network + run: fluence local up + working-directory: aqua-tests + - name: Print fcli version run: pytest -s test_fluence_cli_version.py working-directory: aqua-tests diff --git a/aqua-tests/.fluence/provider-secrets.yaml b/aqua-tests/.fluence/provider-secrets.yaml new file mode 100644 index 0000000..3d79c1b --- /dev/null +++ b/aqua-tests/.fluence/provider-secrets.yaml @@ -0,0 +1,18 @@ +# yaml-language-server: $schema=schemas/provider-secrets.json + +# Defines secrets config used for provider set up + +# Documentation: https://github.com/fluencelabs/cli/tree/main/docs/configs/provider-secrets.md + +version: 0 + +noxes: + nox-0: + networkKey: t/7R5m9TprvbWFwr2ZKe8hm6UW84ulDq4pVbDvHUCdw= + signingWallet: "0x3785b85a34b65082664bdb2ccb47fba6aab6984b7c16b36ad54145eecc368e4c" + nox-1: + networkKey: +5VkzeaILY+Emk9zsLKJ82dzzF3fMmlFkNhkJVwDMdo= + signingWallet: "0xd9a5eee84979d0cf118f82f7c97ca6980e6a21db0c7271a3d59248841ed04d83" + nox-2: + networkKey: YNq7A6KlPhdyJwq7y3meTIPUVQ34HFwW21MlsDjpxsM= + signingWallet: "0x16e3984df2918538c5dbba032f00a5ecd5900b9c43a36b38ed89b6be1820a9ba" diff --git a/aqua-tests/.fluence/schemas/envs.json b/aqua-tests/.fluence/schemas/envs.json new file mode 100644 index 0000000..53bb449 --- /dev/null +++ b/aqua-tests/.fluence/schemas/envs.json @@ -0,0 +1,29 @@ +{ + "$id": "https://fluence.dev/schemas/env.yaml", + "title": "env.yaml", + "type": "object", + "description": "Defines user project preferences", + "properties": { + "fluenceEnv": { + "title": "Fluence environment", + "description": "Fluence environment to connect to", + "type": "string", + "enum": [ + "dar", + "stage", + "kras", + "local", + "custom" + ], + "nullable": true + }, + "version": { + "type": "number", + "const": 0 + } + }, + "required": [ + "version" + ], + "additionalProperties": false +}