Skip to content

FREEZE_XieXie #1669

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

Merged
merged 44 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
03b1525
add traefik endpoint to api-gateway (#1555)
sanderegg Jun 15, 2020
680eb59
added simcore_webserver_service in pytest simcore package (#1563)
sanderegg Jun 17, 2020
821c8e6
Is1269/api-server upgrade (#1475)
pcrespov Jun 17, 2020
16c30b9
Is/add notebook migration script (#1565)
sanderegg Jun 19, 2020
b6a2568
Manage groups, Share studies (#1512)
odeimaiz Jun 19, 2020
3fb36d0
maintenance fix codecov reports (#1568)
sanderegg Jun 22, 2020
bdfcd08
Bump faker from 4.1.0 to 4.1.1 in /packages/postgres-database (#1573)
dependabot-preview[bot] Jun 22, 2020
1b7a47e
Is1570/study fails 500 (#1572)
pcrespov Jun 22, 2020
294611d
Maintenance/upgrades and tooling (#1546)
pcrespov Jun 22, 2020
fb9870f
Adds support for GPU scheduling of computational services (#1553)
GitHK Jun 23, 2020
a329aea
Maintenance/cleanup api server (#1578)
pcrespov Jun 24, 2020
95df8da
Cleanup catalog service (#1582)
pcrespov Jun 26, 2020
6b02813
Bugfix/apiserver does not need sslheaders (#1564)
sanderegg Jun 30, 2020
681fc9c
[feature] UI Fine grained access - project locking and notification
sanderegg Jun 30, 2020
bb0788f
Homogenize studies and services (#1569)
odeimaiz Jul 2, 2020
cb0094b
Shared project concurrency (frontend) (#1591)
odeimaiz Jul 2, 2020
6f50e8e
Excudes e2e stage from include until fixed (#1595)
pcrespov Jul 2, 2020
c025875
reduce cardinality of metrics (#1593)
sanderegg Jul 3, 2020
71553ca
fix deploy not needing e2e testing since it is disabled
sanderegg Jul 3, 2020
3adbfa4
Feature/fix e2e 2 (#1600)
odeimaiz Jul 3, 2020
47b24c6
[bugfix] Invalidate cache before starting a study (#1602)
odeimaiz Jul 3, 2020
2594bfe
fix testing if node has gpu support (#1604)
sanderegg Jul 7, 2020
32276c9
Bump docker from 4.2.1 to 4.2.2 in /packages/postgres-database (#1605)
dependabot-preview[bot] Jul 7, 2020
153e9b2
Bugfix/allow reading groups anonymous user (#1615)
sanderegg Jul 8, 2020
8da6422
Bugfix/concurent opening projects (#1598)
sanderegg Jul 8, 2020
9ec9d21
Maintenance/upgrades test tools (#1628)
pcrespov Jul 13, 2020
0f26bc2
filter studies by name before deleting them (#1629)
odeimaiz Jul 13, 2020
e42cc0b
Improve e2e (#1631)
odeimaiz Jul 14, 2020
18fa7aa
Some enhancements and bug fixes (#1608)
ignapas Jul 14, 2020
a58c578
Fixes on publish studies handling (#1632)
pcrespov Jul 14, 2020
45add3b
Is1585/cleanup storage (#1586)
pcrespov Jul 16, 2020
7c17e52
Bump lodash from 4.17.15 to 4.17.19 (#1639)
dependabot[bot] Jul 17, 2020
df488dd
Fixes default (#1640)
pcrespov Jul 17, 2020
91d9482
2 bugs fixed + Some improvements (#1634)
odeimaiz Jul 17, 2020
f801fdd
is1594 fix and re-activate e2e testing (#1620)
pcrespov Jul 20, 2020
4159b89
Platform stability: (#1645)
odeimaiz Jul 20, 2020
78631d2
Theming (#1656)
ignapas Jul 29, 2020
a12817d
Bump aiozipkin from 0.6.0 to 0.7.0 in /packages/service-library (#1642)
dependabot-preview[bot] Aug 3, 2020
f0e11ca
Improving storage performance (#1659)
GitHK Aug 3, 2020
eba4c8b
Bump pytest-docker from 0.7.2 to 0.8.0 in /packages/service-library (…
dependabot-preview[bot] Aug 3, 2020
d0791e7
Bump ujson from 3.0.0 to 3.1.0 in /packages/service-library (#1664)
dependabot-preview[bot] Aug 4, 2020
00c4f65
Bump yarl from 1.4.2 to 1.5.1 in /packages/postgres-database (#1665)
dependabot-preview[bot] Aug 4, 2020
34919ab
UI/UX improvements (#1657)
odeimaiz Aug 4, 2020
b5117fd
Merge branch 'staging' into FREEZE_XieXie
odeimaiz Aug 4, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ exclude_patterns:
- "**/migrations/"
- "**/*.js"
- "**/pytest-simcore/"
- "**/sandbox/"
56 changes: 56 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
codecov:
require_ci_to_pass: yes
branch: master

coverage:
precision: 1
round: down
range: "70...100"

status:
project:
default:
informational: true
threshold: 1%
paths:
- api
- packages
- services
api:
informational: true
threshold: 1%
paths:
- api
packages:
informational: true
threshold: 1%
paths:
- packages
services:
informational: true
threshold: 1%
paths:
- services


patch:
default:
informational: true
threshold: 1%
paths:
- api
- packages
- services

parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no

comment:
layout: "reach,diff,flags,tree"
behavior: default
require_changes: no
1 change: 1 addition & 0 deletions .env-devel
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ TRACING_ZIPKIN_ENDPOINT=http://jaeger:9411

TRAEFIK_SIMCORE_ZONE=internal_simcore_stack

WEBSERVER_HOST=webserver
WEBSERVER_LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED=0
# python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())"
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Makefile @pcrespov, @sanderegg
/scripts/demo @odeimaiz, @pcrespov
/scripts/json-schema-to-openapi-schema @sanderegg
/scripts/template-projects @odeimaiz, @pcrespov
/services/api-gateway @pcrespov
/services/api-server @pcrespov
/services/catalog @pcrespov
/services/sidecar @pcrespov, @mguidon
/services/web/client @odeimaiz, @oetiker, @ignapas
Expand Down
31 changes: 20 additions & 11 deletions .github/workflows/ci-testing-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
- name: test
run: ./ci/github/unit-testing/api.bash test

unit-test-api-gateway:
name: Unit-testing api-gateway
unit-test-api-server:
name: Unit-testing api-server
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down Expand Up @@ -86,22 +86,22 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-
- name: install
run: ./ci/github/unit-testing/api-gateway.bash install
run: ./ci/github/unit-testing/api-server.bash install
- name: test
run: ./ci/github/unit-testing/api-gateway.bash test
run: ./ci/github/unit-testing/api-server.bash test
- uses: codecov/codecov-action@v1
with:
flags: unittests #optional
- name: prepare codeclimate coverage file
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_gateway_coverage.json coverage.xml
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.unit_api_server_coverage.json coverage.xml
- name: upload codeclimate coverage
uses: actions/upload-artifact@v1
with:
name: unit_api_gateway_coverage
path: codeclimate.unit_api_gateway_coverage.json
name: unit_api_server_coverage
path: codeclimate.unit_api_server_coverage.json

unit-test-catalog:
name: Unit-testing catalog
Expand Down Expand Up @@ -748,6 +748,8 @@ jobs:
run: ./ci/github/system-testing/swarm-deploy.bash clean_up

system-test-e2e:
# FIXME: skip the job until make it faster and more reliable
# https://github.com/ITISFoundation/osparc-simcore/issues/1594
name: System-testing e2e
needs: [build-test-images]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -794,8 +796,15 @@ jobs:
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- name: install
run: ./ci/github/system-testing/e2e.bash install
- name: setup images
run: ./ci/github/system-testing/e2e.bash setup_images
- name: setup environment
run: ./ci/github/system-testing/e2e.bash setup_environment
- name: setup registry
run: ./ci/github/system-testing/e2e.bash setup_registry
- name: setup database
timeout-minutes: 2
run: ./ci/github/system-testing/e2e.bash setup_database
- name: test
run: ./ci/github/system-testing/e2e.bash test
- name: recover docker logs
Expand Down Expand Up @@ -838,7 +847,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/download-artifact@v1
with:
name: unit_api_gateway_coverage
name: unit_api_server_coverage
- uses: actions/download-artifact@v1
with:
name: unit_catalog_coverage
Expand Down Expand Up @@ -873,7 +882,7 @@ jobs:
run: |
mkdir all_coverages
cp \
unit_api_gateway_coverage/*.json \
unit_api_server_coverage/*.json \
unit_catalog_coverage/*.json \
unit_director_coverage/*.json \
unit_sidecar_coverage/*.json \
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ ENV/
node_modules/

# IDEs config
.vscode/
.vscode/launch.json
.vscode/settings.json

# Manual overrides
services/docker-compose.override.yml
Expand Down Expand Up @@ -150,3 +151,7 @@ prof/

# outputs from make
.stack-*.yml


# Copies
services/**/.codeclimate.yml
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code
extension-pkg-whitelist=
extension-pkg-whitelist=pydantic

# Add files or directories to the blacklist. They should be base names, not
# paths.
Expand Down
57 changes: 14 additions & 43 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ jobs:
after_failure:
- unbuffer bash ci/travis/unit-testing/webserver.bash after_failure

# test python, api-gateway ----------------------------------------------------------------------
# test python, api-server ----------------------------------------------------------------------
- stage: build / unit-testing
name: api-gateway
name: api-server
language: python
python:
- "3.6"
Expand All @@ -118,17 +118,17 @@ jobs:
- docker
cache: pip
before_install:
- sudo bash ci/travis/unit-testing/api-gateway.bash before_install
- sudo bash ci/travis/unit-testing/api-server.bash before_install
install:
- unbuffer bash ci/travis/unit-testing/api-gateway.bash install
- unbuffer bash ci/travis/unit-testing/api-server.bash install
before_script:
- unbuffer bash ci/travis/unit-testing/api-gateway.bash before_script
- unbuffer bash ci/travis/unit-testing/api-server.bash before_script
script:
- unbuffer bash ci/travis/unit-testing/api-gateway.bash script
- unbuffer bash ci/travis/unit-testing/api-server.bash script
after_success:
- unbuffer bash ci/travis/unit-testing/api-gateway.bash after_success
- unbuffer bash ci/travis/unit-testing/api-server.bash after_success
after_failure:
- unbuffer bash ci/travis/unit-testing/api-gateway.bash after_failure
- unbuffer bash ci/travis/unit-testing/api-server.bash after_failure

# test python, catalog ----------------------------------------------------------------------
- stage: build / unit-testing
Expand Down Expand Up @@ -385,41 +385,7 @@ jobs:
after_failure:
- unbuffer bash ci/travis/system-testing/swarm-deploy.bash after_failure

# system testing e2e testing -----------------------------------------------------------------
# https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#running-puppeteer-on-travis-ci
- stage: integration-testing / system-testing
name: e2e testing
language: node_js
node_js:
- "10"
sudo: required
services:
- xvfb
addons:
apt:
packages:
- libnss3 # This is required to run new chrome on old trusty
- expect-dev # for unbuffer: brings color back into travis logs
- docker-ce
- python3-venv
notifications:
email: false
cache:
directories:
- node_modules
before_install:
- sudo bash ci/travis/system-testing/e2e.bash before_install
install:
- unbuffer bash ci/travis/system-testing/e2e.bash install
before_script:
- unbuffer bash ci/travis/system-testing/e2e.bash before_script
script:
- unbuffer bash ci/travis/system-testing/e2e.bash script
after_success:
- unbuffer bash ci/travis/system-testing/e2e.bash after_success
after_failure:
- unbuffer bash ci/travis/system-testing/e2e.bash after_failure

# deployment in master environ ----------------------------------------------------------------
- stage: deployment
name: master
if: branch = master
Expand All @@ -434,6 +400,8 @@ jobs:
script: unbuffer bash ci/deploy/dockerhub-deploy.bash
on:
branch: master

# deployment to staging environ ----------------------------------------------------------------
- stage: deployment
name: staging
if: branch = staging
Expand All @@ -448,6 +416,8 @@ jobs:
script: unbuffer bash ci/deploy/dockerhub-deploy.bash
on:
branch: staging

# deployment to production environ ----------------------------------------------------------------
- stage: deployment
name: production/release
env:
Expand All @@ -464,6 +434,7 @@ jobs:
all_branches: true
tags: true
condition: $TRAVIS_TAG =~ ^v[0-9]+.[0-9]+.[0-9]+$

notifications:
email:
on_success: never
Expand Down
42 changes: 0 additions & 42 deletions .vscode-template/README.md

This file was deleted.

16 changes: 15 additions & 1 deletion .vscode-template/launch.json → .vscode/launch.template.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// This is a template. Clone and replace extension ".template.json" by ".json"
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
Expand Down Expand Up @@ -43,6 +44,19 @@
}
]
},
{
"name": "Python: Remote Attach sidecar_gpu",
"type": "python",
"request": "attach",
"port": 3007,
"host": "127.0.0.1",
"pathMappings": [
{
"localRoot": "${workspaceFolder}",
"remoteRoot": "/devel"
}
]
},
{
"name": "Python: Remote Attach storage",
"type": "python",
Expand Down Expand Up @@ -86,4 +100,4 @@
"port": 9229
}
]
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// This is a template. Clone and replace extension ".template.json" by ".json"
{
"editor.tabSize": 2,
"editor.insertSpaces": true,
Expand Down Expand Up @@ -34,4 +35,4 @@
"shellcheck.run": "onSave",
"shellcheck.enableQuickFix": true,
"python.formatting.provider": "black"
}
}
Loading