Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use fcli instead of docker-compose for tests #344

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 0 additions & 134 deletions .github/e2e/docker-compose.yml

This file was deleted.

24 changes: 6 additions & 18 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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/[email protected]
with:
compose-file: ".github/e2e/docker-compose.yml"
down-flags: "--volumes"

- name: Setup python
uses: actions/setup-python@v4
with:
Expand All @@ -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
Expand Down
18 changes: 18 additions & 0 deletions aqua-tests/.fluence/provider-secrets.yaml
Original file line number Diff line number Diff line change
@@ -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"
29 changes: 29 additions & 0 deletions aqua-tests/.fluence/schemas/envs.json
Original file line number Diff line number Diff line change
@@ -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
}
Loading