diff --git a/.github/workflows/bats-hub.yml b/.github/workflows/bats-hub.yml index 9faa80e3284..fe45210ae96 100644 --- a/.github/workflows/bats-hub.yml +++ b/.github/workflows/bats-hub.yml @@ -17,7 +17,7 @@ jobs: matrix: test-file: ["hub-1.bats", "hub-2.bats", "hub-3.bats"] - name: "Build + tests" + name: "Functional tests" runs-on: ubuntu-latest timeout-minutes: 30 steps: diff --git a/.github/workflows/bats-mysql.yml b/.github/workflows/bats-mysql.yml index a751d5529f8..902c25ba329 100644 --- a/.github/workflows/bats-mysql.yml +++ b/.github/workflows/bats-mysql.yml @@ -12,7 +12,7 @@ env: jobs: build: - name: "Build + tests" + name: "Functional tests" runs-on: ubuntu-latest timeout-minutes: 30 services: diff --git a/.github/workflows/bats-postgres.yml b/.github/workflows/bats-postgres.yml index 91b3e9a3b64..e15f1e410c1 100644 --- a/.github/workflows/bats-postgres.yml +++ b/.github/workflows/bats-postgres.yml @@ -8,7 +8,7 @@ env: jobs: build: - name: "Build + tests" + name: "Functional tests" runs-on: ubuntu-latest timeout-minutes: 30 services: diff --git a/.github/workflows/bats-sqlite-coverage.yml b/.github/workflows/bats-sqlite-coverage.yml index 49c9ef8ea15..36194555e1d 100644 --- a/.github/workflows/bats-sqlite-coverage.yml +++ b/.github/workflows/bats-sqlite-coverage.yml @@ -9,7 +9,7 @@ env: jobs: build: - name: "Build + tests" + name: "Functional tests" runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml index 13341628fc0..7bc63de0178 100644 --- a/.github/workflows/docker-tests.yml +++ b/.github/workflows/docker-tests.yml @@ -15,9 +15,9 @@ on: - 'README.md' jobs: - test_docker_image: + test_flavor: strategy: - # we could run all the flavors in a single pytest job, + # we could test all the flavors in a single pytest job, # but let's split them (and the image build) in multiple runners for performance matrix: # can be slim, full or debian (no debian slim). diff --git a/docker/test/tests/test_tls.py b/docker/test/tests/test_tls.py index f12b2ff1b9a..591afe0d303 100644 --- a/docker/test/tests/test_tls.py +++ b/docker/test/tests/test_tls.py @@ -241,7 +241,7 @@ def test_tls_mutual_split_lapi_agent(crowdsec, flavor, certs_dir): assert "You can successfully interact with Local API (LAPI)" in stdout -def test_tls_client_ou(crowdsec, certs_dir): +def test_tls_client_ou(crowdsec, flavor, certs_dir): """Check behavior of client certificate vs AGENTS_ALLOWED_OU""" rand = uuid.uuid1() @@ -270,8 +270,8 @@ def test_tls_client_ou(crowdsec, certs_dir): certs_dir(lapi_hostname=lapiname, agent_ou='custom-client-ou'): {'bind': '/etc/ssl/crowdsec', 'mode': 'ro'}, } - cs_lapi = crowdsec(name=lapiname, environment=lapi_env, volumes=volumes) - cs_agent = crowdsec(name=agentname, environment=agent_env, volumes=volumes) + cs_lapi = crowdsec(flavor=flavor, name=lapiname, environment=lapi_env, volumes=volumes) + cs_agent = crowdsec(flavor=flavor, name=agentname, environment=agent_env, volumes=volumes) with cs_lapi as lapi: lapi.wait_for_log([ @@ -300,8 +300,8 @@ def test_tls_client_ou(crowdsec, certs_dir): certs_dir(lapi_hostname=lapiname, agent_ou='custom-client-ou'): {'bind': '/etc/ssl/crowdsec', 'mode': 'ro'}, } - cs_lapi = crowdsec(name=lapiname, environment=lapi_env, volumes=volumes) - cs_agent = crowdsec(name=agentname, environment=agent_env, volumes=volumes) + cs_lapi = crowdsec(flavor=flavor, name=lapiname, environment=lapi_env, volumes=volumes) + cs_agent = crowdsec(flavor=flavor, name=agentname, environment=agent_env, volumes=volumes) with cs_lapi as lapi: lapi.wait_for_log([