forked from ITISFoundation/osparc-simcore
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 6835-tracing-to-logs-prometheus-and-httpx
- Loading branch information
Showing
310 changed files
with
13,041 additions
and
19,148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -75,7 +75,6 @@ jobs: | |
efs-guardian: ${{ steps.filter.outputs.efs-guardian }} | ||
invitations: ${{ steps.filter.outputs.invitations }} | ||
migration: ${{ steps.filter.outputs.migration }} | ||
osparc-gateway-server: ${{ steps.filter.outputs.osparc-gateway-server }} | ||
payments: ${{ steps.filter.outputs.payments }} | ||
dynamic-scheduler: ${{ steps.filter.outputs.dynamic-scheduler }} | ||
resource-usage-tracker: ${{ steps.filter.outputs.resource-usage-tracker }} | ||
|
@@ -222,12 +221,6 @@ jobs: | |
- 'packages/**' | ||
- 'services/migration/**' | ||
- 'services/docker-compose*' | ||
osparc-gateway-server: | ||
- 'packages/**' | ||
- 'services/osparc-gateway-server/**' | ||
- 'services/docker-compose*' | ||
- 'scripts/mypy/*' | ||
- 'mypy.ini' | ||
payments: | ||
- 'packages/**' | ||
- 'services/payments/**' | ||
|
@@ -1161,64 +1154,6 @@ jobs: | |
with: | ||
token: ${{ secrets.CODECOV_TOKEN }} | ||
|
||
unit-test-osparc-gateway-server: | ||
needs: changes | ||
if: ${{ needs.changes.outputs.osparc-gateway-server == 'true' || github.event_name == 'push' }} | ||
timeout-minutes: 18 # if this timeout gets too small, then split the tests | ||
name: "[unit] osparc-gateway-server" | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
python: ["3.11"] | ||
os: [ubuntu-22.04] | ||
fail-fast: false | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: setup docker buildx | ||
id: buildx | ||
uses: docker/setup-buildx-action@v3 | ||
with: | ||
driver: docker-container | ||
- name: setup python environment | ||
uses: actions/setup-python@v5 | ||
with: | ||
python-version: ${{ matrix.python }} | ||
- name: install uv | ||
uses: astral-sh/setup-uv@v4 | ||
with: | ||
version: "0.4.x" | ||
enable-cache: false | ||
cache-dependency-glob: "**/osparc-gateway-server/requirements/ci.txt" | ||
- name: show system version | ||
run: ./ci/helpers/show_system_versions.bash | ||
- name: install | ||
run: | | ||
make devenv | ||
source .venv/bin/activate && \ | ||
pushd services/osparc-gateway-server && \ | ||
make install-ci | ||
- name: typecheck | ||
run: | | ||
source .venv/bin/activate && \ | ||
pushd services/osparc-gateway-server && \ | ||
make mypy | ||
- name: test | ||
if: ${{ !cancelled() }} | ||
run: | | ||
source .venv/bin/activate && \ | ||
pushd services/osparc-gateway-server && \ | ||
make test-ci-unit | ||
- uses: codecov/[email protected] | ||
env: | ||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} | ||
with: | ||
flags: unittests #optional | ||
- name: Upload test results to Codecov | ||
if: ${{ !cancelled() }} | ||
uses: codecov/test-results-action@v1 | ||
with: | ||
token: ${{ secrets.CODECOV_TOKEN }} | ||
|
||
unit-test-payments: | ||
needs: changes | ||
if: ${{ needs.changes.outputs.payments == 'true' || github.event_name == 'push' }} | ||
|
@@ -1965,7 +1900,6 @@ jobs: | |
unit-test-models-library, | ||
unit-test-common-library, | ||
unit-test-notifications-library, | ||
unit-test-osparc-gateway-server, | ||
unit-test-payments, | ||
unit-test-dynamic-scheduler, | ||
unit-test-postgres-database, | ||
|
@@ -2317,84 +2251,6 @@ jobs: | |
with: | ||
flags: integrationtests #optional | ||
|
||
integration-test-osparc-gateway-server: | ||
needs: [changes, build-test-images] | ||
if: ${{ needs.changes.outputs.anything-py == 'true' || needs.changes.outputs.osparc-gateway-server == 'true' || github.event_name == 'push' }} | ||
timeout-minutes: 30 # if this timeout gets too small, then split the tests | ||
name: "[int] osparc-gateway-server" | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
matrix: | ||
python: ["3.11"] | ||
os: [ubuntu-22.04] | ||
fail-fast: false | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: setup docker buildx | ||
id: buildx | ||
uses: docker/setup-buildx-action@v3 | ||
with: | ||
driver: docker-container | ||
|
||
- name: setup python environment | ||
uses: actions/setup-python@v5 | ||
with: | ||
python-version: ${{ matrix.python }} | ||
- name: expose github runtime for buildx | ||
uses: crazy-max/ghaction-github-runtime@v3 | ||
# FIXME: Workaround for https://github.com/actions/download-artifact/issues/249 | ||
- name: download docker images with retry | ||
uses: Wandalen/wretry.action@master | ||
with: | ||
action: actions/download-artifact@v4 | ||
with: | | ||
name: docker-buildx-images-${{ runner.os }}-${{ github.sha }} | ||
path: /${{ runner.temp }}/build | ||
attempt_limit: 5 | ||
attempt_delay: 1000 | ||
- name: load docker images | ||
run: make load-images local-src=/${{ runner.temp }}/build | ||
- name: install uv | ||
uses: astral-sh/setup-uv@v4 | ||
with: | ||
version: "0.4.x" | ||
enable-cache: false | ||
cache-dependency-glob: "**/osparc-gateway-server/requirements/ci.txt" | ||
- name: show system version | ||
run: ./ci/helpers/show_system_versions.bash | ||
- name: install | ||
run: | | ||
make devenv && \ | ||
source .venv/bin/activate && \ | ||
pushd services/osparc-gateway-server && \ | ||
make install-ci | ||
- name: integration-test | ||
run: | | ||
source .venv/bin/activate && \ | ||
pushd services/osparc-gateway-server && \ | ||
make test-ci-integration | ||
- name: system-test | ||
run: | | ||
source .venv/bin/activate && \ | ||
pushd services/osparc-gateway-server && \ | ||
make test-system | ||
- name: upload failed tests logs | ||
if: ${{ !cancelled() }} | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: ${{ github.job }}_docker_logs | ||
path: ./services/director-v2/test_failures | ||
- name: cleanup | ||
if: ${{ !cancelled() }} | ||
run: | | ||
pushd services/osparc-gateway-server && \ | ||
make down | ||
- uses: codecov/[email protected] | ||
env: | ||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} | ||
with: | ||
flags: integrationtests #optional | ||
|
||
integration-test-simcore-sdk: | ||
needs: [changes, build-test-images] | ||
if: ${{ needs.changes.outputs.anything-py == 'true' || needs.changes.outputs.simcore-sdk == 'true' || github.event_name == 'push' }} | ||
|
@@ -2460,13 +2316,12 @@ jobs: | |
|
||
integration-tests: | ||
# NOTE: this is a github required status check! | ||
if: ${{ !cancelled() }} | ||
if: ${{ always() }} | ||
needs: | ||
[ | ||
integration-test-director-v2-01, | ||
integration-test-director-v2-02, | ||
integration-test-dynamic-sidecar, | ||
integration-test-osparc-gateway-server, | ||
integration-test-simcore-sdk, | ||
integration-test-webserver-01, | ||
integration-test-webserver-02, | ||
|
@@ -2792,7 +2647,7 @@ jobs: | |
|
||
system-tests: | ||
# NOTE: this is a github required status check! | ||
if: ${{ !cancelled() }} | ||
if: ${{ always() }} | ||
needs: | ||
[ | ||
system-test-e2e, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.