Skip to content

Commit

Permalink
FREEZE_Mithos_v1 (#1314)
Browse files Browse the repository at this point in the history
- Is1273/groups api (#1276)
- Hints + PROGREssbars (son del PSOE) + Favicon + Buttons visibility + filters (#1287)
- Is1289/mail environs (#1291)
- [bug] Fixes database blockage upon many requests on projects interface (#1301)
- Increase timeout for test (#1299)
- Revert "webserver does not respond when many logs are coming in from rabbitMQ (#1293)" (#1297)
- Appends more information in e2e's test screenshots (III) (#1296)
- Appends more information in e2e's test screenshots (II) (#1295)
- more info (#1294)
- webserver does not respond when many logs are coming in from rabbitMQ (#1293)
- Is1233/auto update postgres (#1290)
  • Loading branch information
sanderegg authored Feb 26, 2020
1 parent f94cb52 commit 9082a78
Show file tree
Hide file tree
Showing 177 changed files with 4,717 additions and 8,991 deletions.
6 changes: 6 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[run]
branch = True
omit =
*/tests/*
*/generated_code/*
parallel = True
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Makefile @pcrespov, @sanderegg
/scripts/demo @odeimaiz, @pcrespov
/scripts/json-schema-to-openapi-schema @sanderegg
/scripts/template-projects @odeimaiz, @pcrespov
/services/dy* @sanderegg
/services/catalog @pcrespov
/services/sidecar @pcrespov, @mguidon
/services/web/client @odeimaiz, @oetiker, @ignapas
/services/web/server @pcrespov
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ jobs:
name: deploy release
runs-on: ubuntu-latest
env:
OWNER: ${GITHUB_REPOSITORY%/*}
TAG_PREFIX: staging-github
GIT_TAG: ${GITHUB_REF##*/}
steps:
- uses: actions/checkout@v1
- name: setup-docker
uses: docker-practice/[email protected]
- name: setup docker-compose
run: sudo ./ci/github/helpers/setup_docker_compose.sh
- name: set owner variable
run: echo ::set-env name=OWNER::${GITHUB_REPOSITORY%/*}
- name: set git tag
run: echo ::set-env name=GIT_TAG::${GITHUB_REF##*/}
- name: deploy
run: ./ci/deploy/dockerhub-release
115 changes: 62 additions & 53 deletions .github/workflows/ci-testing-deploy-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
# secrets can be set in settings/secrets on github, but are not available in PRs!!
DOCKER_REGISTRY: itisfoundation
DOCKER_REGISTRY: itisfoundation
CODECOV_TOKEN: 0e81ae5f-1909-4035-921c-571693fdafd1
CC_TEST_REPORTER_ID: 21a72eb30476c870140b1576258873a41be6692f71bd9aebe812174b7d8f4b4e
#enable buildkit
Expand Down Expand Up @@ -47,6 +47,38 @@ jobs:
run: ./ci/github/unit-testing/api install
- name: test
run: ./ci/github/unit-testing/api test

unit-test-catalog:
name: Unit-testing catalog
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: [3.6]
os: [ubuntu-18.04]
fail-fast: false
steps:
- uses: actions/checkout@v1
- name: setup-docker
uses: docker-practice/[email protected]
- name: setup docker-compose
run: sudo ./ci/github/helpers/setup_docker_compose.sh
- name: setup python environment
uses: actions/[email protected]
with:
python-version: ${{ matrix.python }}
- name: show system version
run: ./ci/helpers/show_system_versions
- uses: actions/cache@v1
name: getting cached data
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: install
run: ./ci/github/unit-testing/catalog install
- name: test
run: ./ci/github/unit-testing/catalog test
- uses: codecov/codecov-action@v1
with:
token: ${{ env.CODECOV_TOKEN }} #required
Expand All @@ -55,12 +87,12 @@ jobs:
run: |
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_api_coverage.json coverage.xml
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_catalog_coverage.json coverage.xml
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: unit_api_coverage
path: codeclimate.unit_api_coverage.json
name: unit_catalog_coverage
path: codeclimate.unit_catalog_coverage.json

unit-test-director:
name: Unit-testing director
Expand Down Expand Up @@ -102,7 +134,7 @@ jobs:
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_director_coverage.json coverage.xml
- name: upload codeclimate coverage
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: unit_director_coverage
Expand Down Expand Up @@ -176,7 +208,6 @@ jobs:
- name: test
run: ./ci/github/unit-testing/python-linting test


unit-test-service-library:
name: Unit-testing service-library
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -217,42 +248,12 @@ jobs:
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_servicelib_coverage.json coverage.xml
- name: upload codeclimate coverage
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: unit_servicelib_coverage
path: codeclimate.unit_servicelib_coverage.json

# DISABLED for now
# unit-test-sidecar:
# name: Unit-testing sidecar
# runs-on: ${{ matrix.os }}
# strategy:
# matrix:
# python: [3.6]
# os: [ubuntu-18.04]
# fail-fast: false
# steps:
# - uses: actions/checkout@v1
# - name: setup-docker
# uses: docker-practice/[email protected]
# - name: setup docker-compose
# run: sudo ./ci/github/helpers/setup_docker_compose.sh
# - name: setup python environment
# uses: actions/[email protected]
# with:
# python-version: ${{ matrix.python }}
# - name: show system version
# run: ./ci/helpers/show_system_versions
# - name: install
# run: ./ci/github/unit-testing/sidecar install
# - name: test
# run: ./ci/github/unit-testing/sidecar test
# - uses: codecov/codecov-action@v1
# with:
# token: ${{ env.CODECOV_TOKEN }} #required
# flags: unittests #optional

unit-test-simcore-sdk:
name: Unit-testing simcore-sdk
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -293,7 +294,7 @@ jobs:
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_simcoresdk_coverage.json coverage.xml
- name: upload codeclimate coverage
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: unit_simcoresdk_coverage
Expand Down Expand Up @@ -339,7 +340,7 @@ jobs:
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_storage_coverage.json coverage.xml
- name: upload codeclimate coverage
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: unit_storage_coverage
Expand Down Expand Up @@ -385,7 +386,7 @@ jobs:
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_webserver_coverage.json coverage.xml
- name: upload codeclimate coverage
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: unit_webserver_coverage
Expand Down Expand Up @@ -434,7 +435,7 @@ jobs:
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.integration_webserver_coverage.json coverage.xml
- name: upload codeclimate coverage
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: integration_webserver_coverage
Expand Down Expand Up @@ -483,7 +484,7 @@ jobs:
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
chmod +x ./cc-test-reporter
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.integration_simcoresdk_coverage.json coverage.xml
- name: upload codeclimate coverage
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: integration_simcoresdk_coverage
Expand Down Expand Up @@ -582,27 +583,28 @@ jobs:
with:
name: e2e_screenshots
path: tests/e2e/screenshots
- uses: codecov/codecov-action@v1
with:
token: ${{ env.CODECOV_TOKEN }} #required
flags: e2etests #optional

- name: cleanup
if: always()
run: ./ci/github/system-testing/swarm-deploy clean_up

coverage:
needs: [
unit-test-api, unit-test-director, unit-test-service-library, unit-test-simcore-sdk,
unit-test-storage, unit-test-webserver, integration-test-webserver, integration-test-simcore-sdk
unit-test-catalog,
unit-test-director,
unit-test-service-library,
unit-test-simcore-sdk,
unit-test-storage,
unit-test-webserver,
integration-test-webserver,
integration-test-simcore-sdk
]
name: coverage
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/download-artifact@v1
with:
name: unit_api_coverage
name: unit_catalog_coverage
- uses: actions/download-artifact@v1
with:
name: unit_director_coverage
Expand All @@ -627,8 +629,15 @@ jobs:
- name: put all artefacts together
run: |
mkdir all_coverages
cp unit_api_coverage/*.json unit_director_coverage/*.json unit_servicelib_coverage/*.json unit_simcoresdk_coverage/*.json unit_storage_coverage/*.json unit_webserver_coverage/*.json \
integration_webserver_coverage/*.json integration_simcoresdk_coverage/*.json all_coverages/
cp unit_catalog_coverage/*.json \
unit_director_coverage/*.json \
unit_servicelib_coverage/*.json \
unit_simcoresdk_coverage/*.json \
unit_storage_coverage/*.json \
unit_webserver_coverage/*.json \
integration_webserver_coverage/*.json \
integration_simcoresdk_coverage/*.json \
all_coverages/
ls -al all_coverages
- name: install codeclimate test reporter
run: |
Expand All @@ -637,4 +646,4 @@ jobs:
./cc-test-reporter sum-coverage all_coverages/codeclimate.*.json -p 8
- name: upload coverages
run: |
./cc-test-reporter upload-coverage
./cc-test-reporter upload-coverage
Loading

0 comments on commit 9082a78

Please sign in to comment.