Skip to content

Commit 66a1522

Browse files
authored
removed all sidecar occurences (ITISFoundation#2634)
1 parent bd4f611 commit 66a1522

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+11
-4856
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Makefile @pcrespov, @sanderegg
2727
/services/director*/ @sanderegg, @pcrespov
2828
/services/dynamic-sidecar/ @GitHK
2929
/services/migration/ @pcrespov
30-
/services/sidecar/ @pcrespov, @mguidon
3130
/services/storage/ @mguidon, @pcrespov
3231
/services/static-webserver @GitHK
3332
/services/web/client/ @odeimaiz, @ignapas

.github/workflows/ci-testing-deploy.yml

Lines changed: 0 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -377,63 +377,6 @@ jobs:
377377
name: codeclimate-${{ github.job }}-coverage
378378
path: codeclimate.${{ github.job }}_coverage.json
379379

380-
unit-test-sidecar:
381-
timeout-minutes: 14 # if this timeout gets too small, then split the tests
382-
name: "[unit] sidecar"
383-
runs-on: ${{ matrix.os }}
384-
strategy:
385-
matrix:
386-
python: [3.8]
387-
os: [ubuntu-20.04]
388-
docker_buildx: [v0.5.1]
389-
docker_compose: [1.29.1]
390-
include:
391-
- docker_compose: 1.29.1
392-
docker_compose_sha: 8097769d32e34314125847333593c8edb0dfc4a5b350e4839bef8c2fe8d09de7
393-
fail-fast: false
394-
steps:
395-
- uses: actions/checkout@v2
396-
- name: setup docker buildx
397-
id: buildx
398-
uses: docker/setup-buildx-action@v1
399-
with:
400-
version: ${{ matrix.docker_buildx }}
401-
driver: docker
402-
- name: setup docker-compose
403-
run: sudo ./ci/github/helpers/setup_docker_compose.bash ${{ matrix.docker_compose }} ${{ matrix.docker_compose_sha }}
404-
- name: setup python environment
405-
uses: actions/setup-python@v2
406-
with:
407-
python-version: ${{ matrix.python }}
408-
- name: show system version
409-
run: ./ci/helpers/show_system_versions.bash
410-
- uses: actions/cache@v2
411-
name: getting cached data
412-
with:
413-
path: ~/.cache/pip
414-
key: ${{ runner.os }}-pip-sidecar-${{ hashFiles('services/sidecar/requirements/ci.txt') }}
415-
restore-keys: |
416-
${{ runner.os }}-pip-sidecar-
417-
${{ runner.os }}-pip-
418-
${{ runner.os }}-
419-
- name: install
420-
run: ./ci/github/unit-testing/sidecar.bash install
421-
- name: test
422-
run: ./ci/github/unit-testing/sidecar.bash test
423-
- uses: codecov/[email protected]
424-
with:
425-
flags: unittests #optional
426-
- name: prepare codeclimate coverage file
427-
run: |
428-
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-0.7.0-linux-amd64 > ./cc-test-reporter
429-
chmod +x ./cc-test-reporter && ./cc-test-reporter --version
430-
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.${{ github.job }}_coverage.json coverage.xml
431-
- name: upload codeclimate coverage
432-
uses: actions/upload-artifact@v2
433-
with:
434-
name: codeclimate-${{ github.job }}-coverage
435-
path: codeclimate.${{ github.job }}_coverage.json
436-
437380
unit-test-dask-task-models-library:
438381
timeout-minutes: 14 # if this timeout gets too small, then split the tests
439382
name: "[unit] dask-task-models-library"
@@ -2051,79 +1994,6 @@ jobs:
20511994
name: codeclimate-${{ github.job }}-coverage
20521995
path: codeclimate.${{ github.job }}_coverage.json
20531996

2054-
integration-test-sidecar:
2055-
timeout-minutes: 30 # if this timeout gets too small, then split the tests
2056-
name: "[int] sidecar"
2057-
needs: [build-test-images]
2058-
runs-on: ${{ matrix.os }}
2059-
strategy:
2060-
matrix:
2061-
python: [3.8]
2062-
os: [ubuntu-20.04]
2063-
docker_buildx: [v0.5.1]
2064-
docker_compose: [1.29.1]
2065-
include:
2066-
- docker_compose: 1.29.1
2067-
docker_compose_sha: 8097769d32e34314125847333593c8edb0dfc4a5b350e4839bef8c2fe8d09de7
2068-
fail-fast: false
2069-
steps:
2070-
- name: set PR default variables
2071-
# only pushes have access to the docker credentials, use a default
2072-
if: github.event_name == 'pull_request'
2073-
run: |
2074-
export TMP_DOCKER_REGISTRY=${GITHUB_REPOSITORY%/*}
2075-
echo "DOCKER_REGISTRY=${TMP_DOCKER_REGISTRY,,}" >> $GITHUB_ENV
2076-
- uses: actions/checkout@v2
2077-
- name: setup docker buildx
2078-
id: buildx
2079-
uses: docker/setup-buildx-action@v1
2080-
with:
2081-
version: ${{ matrix.docker_buildx }}
2082-
driver: docker
2083-
- name: setup docker-compose
2084-
run: sudo ./ci/github/helpers/setup_docker_compose.bash ${{ matrix.docker_compose }} ${{ matrix.docker_compose_sha }}
2085-
- name: setup python environment
2086-
uses: actions/setup-python@v2
2087-
with:
2088-
python-version: ${{ matrix.python }}
2089-
- name: show system version
2090-
run: ./ci/helpers/show_system_versions.bash
2091-
- uses: actions/cache@v2
2092-
name: getting cached data
2093-
with:
2094-
path: ~/.cache/pip
2095-
key: ${{ runner.os }}-pip-sidecar-${{ hashFiles('services/sidecar/requirements/ci.txt') }}
2096-
restore-keys: |
2097-
${{ runner.os }}-pip-sidecar-
2098-
${{ runner.os }}-pip-
2099-
${{ runner.os }}-
2100-
- name: install
2101-
run: ./ci/github/integration-testing/sidecar.bash install
2102-
- name: test
2103-
run: ./ci/github/integration-testing/sidecar.bash test
2104-
- name: upload failed tests logs
2105-
if: failure()
2106-
uses: actions/upload-artifact@v2
2107-
with:
2108-
name: ${{ github.job }}_docker_logs
2109-
path: ./services/sidecar/test_failures
2110-
- name: cleanup
2111-
if: always()
2112-
run: ./ci/github/integration-testing/sidecar.bash clean_up
2113-
- uses: codecov/[email protected]
2114-
with:
2115-
flags: integrationtests #optional
2116-
- name: prepare codeclimate coverage file
2117-
run: |
2118-
curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-0.7.0-linux-amd64 > ./cc-test-reporter
2119-
chmod +x ./cc-test-reporter && ./cc-test-reporter --version
2120-
./cc-test-reporter format-coverage -t coverage.py -o codeclimate.${{ github.job }}_coverage.json coverage.xml
2121-
- name: upload codeclimate coverage
2122-
uses: actions/upload-artifact@v2
2123-
with:
2124-
name: codeclimate-${{ github.job }}-coverage
2125-
path: codeclimate.${{ github.job }}_coverage.json
2126-
21271997
integration-test-simcore-sdk:
21281998
timeout-minutes: 30 # if this timeout gets too small, then split the tests
21291999
name: "[int] simcore-sdk"
@@ -2458,7 +2328,6 @@ jobs:
24582328
unit-test-datcore-adapter,
24592329
unit-test-director,
24602330
unit-test-director-v2,
2461-
unit-test-sidecar,
24622331
unit-test-dynamic-sidecar,
24632332
unit-test-dask-task-models-library,
24642333
unit-test-dask-sidecar,
@@ -2483,7 +2352,6 @@ jobs:
24832352
integration-test-webserver-02,
24842353
integration-test-director-v2-01,
24852354
integration-test-director-v2-02,
2486-
integration-test-sidecar,
24872355
integration-test-simcore-sdk,
24882356
]
24892357
name: coverage
@@ -2518,7 +2386,6 @@ jobs:
25182386
unit-test-datcore-adapter,
25192387
unit-test-director,
25202388
unit-test-director-v2,
2521-
unit-test-sidecar,
25222389
unit-test-dynamic-sidecar,
25232390
unit-test-dask-task-models-library,
25242391
unit-test-dask-sidecar,
@@ -2545,7 +2412,6 @@ jobs:
25452412
integration-test-webserver-02,
25462413
integration-test-director-v2-01,
25472414
integration-test-director-v2-02,
2548-
integration-test-sidecar,
25492415
integration-test-simcore-sdk,
25502416
system-test-public-api,
25512417
system-test-swarm-deploy,

.vscode/launch.template.json

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -70,45 +70,6 @@
7070
}
7171
]
7272
},
73-
{
74-
"name": "Python: Remote Attach sidecar",
75-
"type": "python",
76-
"request": "attach",
77-
"port": 3002,
78-
"host": "127.0.0.1",
79-
"pathMappings": [
80-
{
81-
"localRoot": "${workspaceFolder}",
82-
"remoteRoot": "/devel"
83-
}
84-
]
85-
},
86-
{
87-
"name": "Python: Remote Attach sidecar_gpu",
88-
"type": "python",
89-
"request": "attach",
90-
"port": 3007,
91-
"host": "127.0.0.1",
92-
"pathMappings": [
93-
{
94-
"localRoot": "${workspaceFolder}",
95-
"remoteRoot": "/devel"
96-
}
97-
]
98-
},
99-
{
100-
"name": "Python: Remote Attach sidecar_mpi",
101-
"type": "python",
102-
"request": "attach",
103-
"port": 3008,
104-
"host": "127.0.0.1",
105-
"pathMappings": [
106-
{
107-
"localRoot": "${workspaceFolder}",
108-
"remoteRoot": "/devel"
109-
}
110-
]
111-
},
11273
{
11374
"name": "Python: Remote Attach storage",
11475
"type": "python",
@@ -152,4 +113,4 @@
152113
"port": 9229
153114
}
154115
]
155-
}
116+
}

.vscode/settings.template.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"./services/catalog/src",
4242
"./services/director-v2/src",
4343
"./services/director/src",
44-
"./services/sidecar/src",
4544
"./services/storage/src",
4645
"./services/web/server/src",
4746
"./services/web/server/tests/unit/with_dbs",

ci/github/integration-testing/sidecar.bash

Lines changed: 0 additions & 41 deletions
This file was deleted.

ci/github/unit-testing/sidecar.bash

Lines changed: 0 additions & 29 deletions
This file was deleted.

ci/travis/.travis.yml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -255,27 +255,6 @@ jobs:
255255
after_failure:
256256
- unbuffer bash ci/travis/unit-testing/director-v2.bash after_failure
257257

258-
# test python, sidecar ----------------------------------------------------------------------
259-
- stage: build / unit-testing
260-
name: "[unit] sidecar"
261-
language: python
262-
python:
263-
- "3.6"
264-
sudo: required
265-
cache: pip
266-
before_install:
267-
- sudo bash ci/travis/unit-testing/sidecar.bash before_install
268-
install:
269-
- unbuffer bash ci/travis/unit-testing/sidecar.bash install
270-
before_script:
271-
- unbuffer bash ci/travis/unit-testing/sidecar.bash before_script
272-
script:
273-
- unbuffer bash ci/travis/unit-testing/sidecar.bash script
274-
after_success:
275-
- unbuffer bash ci/travis/unit-testing/sidecar.bash after_success
276-
after_failure:
277-
- unbuffer bash ci/travis/unit-testing/sidecar.bash after_failure
278-
279258
# test python, service-library ----------------------------------------------------------------------
280259
- stage: build / unit-testing
281260
name: "[unit] service-library"
@@ -445,27 +424,6 @@ jobs:
445424
after_failure:
446425
- unbuffer bash ci/travis/integration-testing/director-v2.bash after_failure
447426

448-
# integrate sidecar in swarm -------------------------------------------------------------
449-
- stage: integration-testing / system-testing
450-
name: "[int] sidecar"
451-
language: python
452-
python:
453-
- "3.6"
454-
sudo: required
455-
cache: pip
456-
before_install:
457-
- sudo bash ci/travis/integration-testing/sidecar.bash before_install
458-
install:
459-
- unbuffer bash ci/travis/integration-testing/sidecar.bash install
460-
before_script:
461-
- unbuffer bash ci/travis/integration-testing/sidecar.bash before_script
462-
script:
463-
- unbuffer bash ci/travis/integration-testing/sidecar.bash script
464-
after_success:
465-
- unbuffer bash ci/travis/integration-testing/sidecar.bash after_success
466-
after_failure:
467-
- unbuffer bash ci/travis/integration-testing/sidecar.bash after_failure
468-
469427
# integrate simcore-sdk in swarm -------------------------------------------------------------
470428
- stage: integration-testing / system-testing
471429
name: "[int] simcore-sdk"

0 commit comments

Comments
 (0)