diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index ffa3bcf2cd7..a163304fc8d 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -2,8 +2,6 @@ name: Github-CI-Release on: push: - branches: - - staging tags: - v[0-9]+.[0-9]+.[0-9]+ @@ -15,6 +13,8 @@ env: jobs: deploy: + # only run on staging branch + if: github.event.base_ref == 'ref/heads/staging' name: deploy release runs-on: ubuntu-latest env: @@ -24,10 +24,10 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - 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 + run: ./ci/deploy/dockerhub-release.bash diff --git a/.github/workflows/ci-testing-deploy-pr.yml b/.github/workflows/ci-testing-deploy-pr.yml deleted file mode 100644 index 6f9dad0cdc8..00000000000 --- a/.github/workflows/ci-testing-deploy-pr.yml +++ /dev/null @@ -1,649 +0,0 @@ -name: Github-CI-PR - -# this is an exact copy of the push workflow but it does not deploy as PR do not have access to secrets - -on: - pull_request: - - -env: - # secrets can be set in settings/secrets on github, but are not available in PRs!! - DOCKER_REGISTRY: itisfoundation - CODECOV_TOKEN: 0e81ae5f-1909-4035-921c-571693fdafd1 - CC_TEST_REPORTER_ID: 21a72eb30476c870140b1576258873a41be6692f71bd9aebe812174b7d8f4b4e - #enable buildkit - DOCKER_BUILDKIT: 1 - COMPOSE_DOCKER_CLI_BUILD: 1 - -jobs: - unit-test-api: - name: Unit-testing api - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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 api - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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 - 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_catalog_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: unit_catalog_coverage - path: codeclimate.unit_catalog_coverage.json - - unit-test-director: - name: Unit-testing director - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/director install - - name: test - run: ./ci/github/unit-testing/director test - - uses: codecov/codecov-action@v1 - with: - token: ${{ env.CODECOV_TOKEN }} #required - 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_director_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: unit_director_coverage - path: codeclimate.unit_director_coverage.json - - unit-test-frontend: - name: Unit-testing frontend - runs-on: ${{ matrix.os }} - strategy: - matrix: - node: [10] - os: [ubuntu-18.04] - fail-fast: false - steps: - - uses: actions/checkout@v1 - - name: setup-docker - uses: docker-practice/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node }} - - 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/frontend install - - name: test - run: ./ci/github/unit-testing/frontend test - # no coverage here?? - # - uses: codecov/codecov-action@v1 - # with: - # token: ${{ env.CODECOV_TOKEN }} #required - # flags: unittests #optional - - unit-test-python-linting: - name: Unit-testing python-linting - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/python-linting install - - name: test - run: ./ci/github/unit-testing/python-linting test - - unit-test-service-library: - name: Unit-testing service-library - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/service-library install - - name: test - run: ./ci/github/unit-testing/service-library test - - uses: codecov/codecov-action@v1 - with: - token: ${{ env.CODECOV_TOKEN }} #required - 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_servicelib_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: unit_servicelib_coverage - path: codeclimate.unit_servicelib_coverage.json - - unit-test-simcore-sdk: - name: Unit-testing simcore-sdk - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/simcore-sdk install - - name: test - run: ./ci/github/unit-testing/simcore-sdk test - - uses: codecov/codecov-action@v1 - with: - token: ${{ env.CODECOV_TOKEN }} #required - 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_simcoresdk_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: unit_simcoresdk_coverage - path: codeclimate.unit_simcoresdk_coverage.json - - unit-test-storage: - name: Unit-testing storage - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/storage install - - name: test - run: ./ci/github/unit-testing/storage test - - uses: codecov/codecov-action@v1 - with: - token: ${{ env.CODECOV_TOKEN }} #required - 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_storage_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: unit_storage_coverage - path: codeclimate.unit_storage_coverage.json - - unit-test-webserver: - name: Unit-testing webserver - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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 webserver - run: ./ci/github/unit-testing/webserver install - - name: test - run: ./ci/github/unit-testing/webserver test - - uses: codecov/codecov-action@v1 - with: - token: ${{ env.CODECOV_TOKEN }} #required - 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_webserver_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: unit_webserver_coverage - path: codeclimate.unit_webserver_coverage.json - - integration-test-webserver: - name: Integration-testing webserver - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/integration-testing/webserver install - - name: test - run: ./ci/github/integration-testing/webserver test - - name: cleanup - if: always() - run: ./ci/github/integration-testing/webserver clean_up - - uses: codecov/codecov-action@v1 - with: - token: ${{ env.CODECOV_TOKEN }} #required - flags: integrationtests #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.integration_webserver_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: integration_webserver_coverage - path: codeclimate.integration_webserver_coverage.json - - integration-test-simcore-sdk: - name: Integration-testing simcore-sdk - 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/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/integration-testing/simcore-sdk install - - name: test - run: ./ci/github/integration-testing/simcore-sdk test - - name: cleanup - if: always() - run: ./ci/github/integration-testing/simcore-sdk clean_up - - uses: codecov/codecov-action@v1 - with: - token: ${{ env.CODECOV_TOKEN }} #required - flags: integrationtests - - 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.integration_simcoresdk_coverage.json coverage.xml - - name: upload codeclimate coverage - uses: actions/upload-artifact@v1 - with: - name: integration_simcoresdk_coverage - path: codeclimate.integration_simcoresdk_coverage.json - - system-test-swarm-deploy: - name: System-testing deploy simcore - runs-on: ${{ matrix.os }} - strategy: - matrix: - python: [3.6] - os: [ubuntu-16.04, ubuntu-18.04] - fail-fast: false - steps: - - uses: actions/checkout@v1 - - name: setup-docker - uses: docker-practice/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - 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/system-testing/swarm-deploy install - - name: test - run: ./ci/github/system-testing/swarm-deploy test - - name: cleanup - if: always() - run: ./ci/github/system-testing/swarm-deploy clean_up - - system-test-e2e: - name: System-testing e2e - runs-on: ${{ matrix.os }} - strategy: - matrix: - python: [3.6] - node: [10] - os: [ubuntu-18.04] - fail-fast: false - steps: - - uses: actions/checkout@v1 - - name: setup-docker - uses: docker-practice/actions-setup-docker@0.0.1 - - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh - - name: setup python environment - uses: actions/setup-python@v1.1.1 - with: - python-version: ${{ matrix.python }} - - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node }} - - name: show system version - run: ./ci/helpers/show_system_versions - - uses: actions/cache@v1 - name: getting cached data python - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - uses: actions/cache@v1 - name: getting cached data node - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - name: install - run: ./ci/github/system-testing/e2e install - - name: test - run: ./ci/github/system-testing/e2e test - - name: recover docker logs - id: logs_recovery - if: always() - run: ./ci/github/system-testing/e2e recover_artifacts - - name: upload docker logs - if: always() - uses: actions/upload-artifact@v1 - with: - name: e2e_docker_container_logs - path: simcore_logs - - name: upload screenshots - if: always() - uses: actions/upload-artifact@v1 - with: - name: e2e_screenshots - path: tests/e2e/screenshots - - name: cleanup - if: always() - run: ./ci/github/system-testing/swarm-deploy clean_up - - coverage: - needs: [ - 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_catalog_coverage - - uses: actions/download-artifact@v1 - with: - name: unit_director_coverage - - uses: actions/download-artifact@v1 - with: - name: unit_servicelib_coverage - - uses: actions/download-artifact@v1 - with: - name: unit_simcoresdk_coverage - - uses: actions/download-artifact@v1 - with: - name: unit_storage_coverage - - uses: actions/download-artifact@v1 - with: - name: unit_webserver_coverage - - uses: actions/download-artifact@v1 - with: - name: integration_webserver_coverage - - uses: actions/download-artifact@v1 - with: - name: integration_simcoresdk_coverage - - name: put all artefacts together - run: | - mkdir 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: | - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter - ./cc-test-reporter sum-coverage all_coverages/codeclimate.*.json -p 8 - - name: upload coverages - run: | - ./cc-test-reporter upload-coverage diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml index 4eef19d0498..7b0071939c9 100644 --- a/.github/workflows/ci-testing-deploy.yml +++ b/.github/workflows/ci-testing-deploy.yml @@ -1,7 +1,15 @@ -name: Github-CI-Push +name: Github-CI Push/PR on: push: + pull_request: + paths-ignore: + - '*.md' + - '*.png' + - '*.svg' + - 'docs/**' + - '.vscode/**' + - '.vscode-template/**' env: # secrets can be set in settings/secrets on github @@ -28,13 +36,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -43,9 +51,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install api - run: ./ci/github/unit-testing/api install + run: ./ci/github/unit-testing/api.bash install - name: test - run: ./ci/github/unit-testing/api test + run: ./ci/github/unit-testing/api.bash test unit-test-catalog: name: Unit-testing catalog @@ -60,13 +68,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -75,9 +83,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/unit-testing/catalog install + run: ./ci/github/unit-testing/catalog.bash install - name: test - run: ./ci/github/unit-testing/catalog test + run: ./ci/github/unit-testing/catalog.bash test - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -106,13 +114,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -121,9 +129,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/unit-testing/director install + run: ./ci/github/unit-testing/director.bash install - name: test - run: ./ci/github/unit-testing/director test + run: ./ci/github/unit-testing/director.bash test - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -152,12 +160,12 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - uses: actions/setup-node@v1 with: node-version: ${{ matrix.node }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -166,9 +174,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/unit-testing/frontend install + run: ./ci/github/unit-testing/frontend.bash install - name: test - run: ./ci/github/unit-testing/frontend test + run: ./ci/github/unit-testing/frontend.bash test # no coverage here?? # - uses: codecov/codecov-action@v1 # with: @@ -188,13 +196,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -203,9 +211,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/unit-testing/python-linting install + run: ./ci/github/unit-testing/python-linting.bash install - name: test - run: ./ci/github/unit-testing/python-linting test + run: ./ci/github/unit-testing/python-linting.bash test unit-test-service-library: name: Unit-testing service-library @@ -220,13 +228,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -235,9 +243,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/unit-testing/service-library install + run: ./ci/github/unit-testing/service-library.bash install - name: test - run: ./ci/github/unit-testing/service-library test + run: ./ci/github/unit-testing/service-library.bash test - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -266,13 +274,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -281,9 +289,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/unit-testing/simcore-sdk install + run: ./ci/github/unit-testing/simcore-sdk.bash install - name: test - run: ./ci/github/unit-testing/simcore-sdk test + run: ./ci/github/unit-testing/simcore-sdk.bash test - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -312,13 +320,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -327,9 +335,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/unit-testing/storage install + run: ./ci/github/unit-testing/storage.bash install - name: test - run: ./ci/github/unit-testing/storage test + run: ./ci/github/unit-testing/storage.bash test - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -358,13 +366,13 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -373,9 +381,9 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install webserver - run: ./ci/github/unit-testing/webserver install + run: ./ci/github/unit-testing/webserver.bash install - name: test - run: ./ci/github/unit-testing/webserver test + run: ./ci/github/unit-testing/webserver.bash test - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -399,17 +407,19 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: show system environs - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - name: pull images - run: ./ci/build/test-images pull_images + run: ./ci/build/test-images.bash pull_images - name: build images - run: ./ci/build/test-images build_images + run: ./ci/build/test-images.bash build_images - name: set owner variable run: echo ::set-env name=OWNER::${GITHUB_REPOSITORY%/*} - name: push images - run: ./ci/deploy/dockerhub-test-images + # only pushes have access to the docker credentials + if: github.event_name == 'push' + run: ./ci/deploy/dockerhub-test-images.bash integration-test-webserver: name: Integration-testing webserver @@ -421,17 +431,23 @@ jobs: os: [ubuntu-18.04] fail-fast: false steps: + - name: set PR default variables + # only pushes have access to the docker credentials, use a default + if: github.event_name == 'pull_request' + run: | + export TMP_DOCKER_REGISTRY=${GITHUB_REPOSITORY%/*} + echo ::set-env name=DOCKER_REGISTRY::${TMP_DOCKER_REGISTRY,,} - uses: actions/checkout@v1 - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -440,12 +456,12 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/integration-testing/webserver install + run: ./ci/github/integration-testing/webserver.bash install - name: test - run: ./ci/github/integration-testing/webserver test + run: ./ci/github/integration-testing/webserver.bash test - name: cleanup if: always() - run: ./ci/github/integration-testing/webserver clean_up + run: ./ci/github/integration-testing/webserver.bash clean_up - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -471,17 +487,23 @@ jobs: os: [ubuntu-18.04] fail-fast: false steps: + - name: set PR default variables + # only pushes have access to the docker credentials, use a default + if: github.event_name == 'pull_request' + run: | + export TMP_DOCKER_REGISTRY=${GITHUB_REPOSITORY%/*} + echo ::set-env name=DOCKER_REGISTRY::${TMP_DOCKER_REGISTRY,,} - uses: actions/checkout@v1 - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -490,12 +512,12 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/integration-testing/simcore-sdk install + run: ./ci/github/integration-testing/simcore-sdk.bash install - name: test - run: ./ci/github/integration-testing/simcore-sdk test + run: ./ci/github/integration-testing/simcore-sdk.bash test - name: cleanup if: always() - run: ./ci/github/integration-testing/simcore-sdk clean_up + run: ./ci/github/integration-testing/simcore-sdk.bash clean_up - uses: codecov/codecov-action@v1 with: token: ${{ env.CODECOV_TOKEN }} #required @@ -521,17 +543,23 @@ jobs: os: [ubuntu-16.04, ubuntu-18.04] fail-fast: false steps: + - name: set PR default variables + # only pushes have access to the docker credentials, use a default + if: github.event_name == 'pull_request' + run: | + export TMP_DOCKER_REGISTRY=${GITHUB_REPOSITORY%/*} + echo ::set-env name=DOCKER_REGISTRY::${TMP_DOCKER_REGISTRY,,} - uses: actions/checkout@v1 - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: python-version: ${{ matrix.python }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data with: @@ -540,12 +568,12 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: install - run: ./ci/github/system-testing/swarm-deploy install + run: ./ci/github/system-testing/swarm-deploy.bash install - name: test - run: ./ci/github/system-testing/swarm-deploy test + run: ./ci/github/system-testing/swarm-deploy.bash test - name: cleanup if: always() - run: ./ci/github/system-testing/swarm-deploy clean_up + run: ./ci/github/system-testing/swarm-deploy.bash clean_up system-test-e2e: name: System-testing e2e @@ -558,11 +586,17 @@ jobs: os: [ubuntu-18.04] fail-fast: false steps: + - name: set PR default variables + # only pushes have access to the docker credentials, use a default + if: github.event_name == 'pull_request' + run: | + export TMP_DOCKER_REGISTRY=${GITHUB_REPOSITORY%/*} + echo ::set-env name=DOCKER_REGISTRY::${TMP_DOCKER_REGISTRY,,} - uses: actions/checkout@v1 - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: setup python environment uses: actions/setup-python@v1.1.1 with: @@ -571,7 +605,7 @@ jobs: with: node-version: ${{ matrix.node }} - name: show system version - run: ./ci/helpers/show_system_versions + run: ./ci/helpers/show_system_versions.bash - uses: actions/cache@v1 name: getting cached data python with: @@ -587,13 +621,13 @@ jobs: restore-keys: | ${{ runner.os }}-node- - name: install - run: ./ci/github/system-testing/e2e install + run: ./ci/github/system-testing/e2e.bash install - name: test - run: ./ci/github/system-testing/e2e test + run: ./ci/github/system-testing/e2e.bash test - name: recover docker logs id: logs_recovery if: always() - run: ./ci/github/system-testing/e2e recover_artifacts + run: ./ci/github/system-testing/e2e.bash recover_artifacts - name: upload docker logs if: always() uses: actions/upload-artifact@v1 @@ -608,7 +642,7 @@ jobs: path: tests/e2e/screenshots - name: cleanup if: always() - run: ./ci/github/system-testing/swarm-deploy clean_up + run: ./ci/github/system-testing/swarm-deploy.bash clean_up coverage: needs: [ @@ -673,6 +707,7 @@ jobs: deploy: name: deploy to dockerhub + if: github.event_name == 'push' needs: [ unit-test-api, unit-test-catalog, @@ -694,19 +729,19 @@ jobs: - name: setup-docker uses: docker-practice/actions-setup-docker@0.0.1 - name: setup docker-compose - run: sudo ./ci/github/helpers/setup_docker_compose.sh + run: sudo ./ci/github/helpers/setup_docker_compose.bash - name: set owner variable run: echo ::set-env name=OWNER::${GITHUB_REPOSITORY%/*} - name: deploy master if: github.ref == 'refs/heads/master' env: TAG_PREFIX: master-github - run: ./ci/deploy/dockerhub-deploy + run: ./ci/deploy/dockerhub-deploy.bash - name: deploy staging if: github.ref == 'refs/heads/staging' env: TAG_PREFIX: staging-github - run: ./ci/deploy/dockerhub-deploy + run: ./ci/deploy/dockerhub-deploy.bash # TODO: here we need a incoming webhook for mattermost (ask admin for it) (https://docs.mattermost.com/developer/webhooks-incoming.html) # - name: mattermost notification # uses: tferreira/matterfy@releases/v1 diff --git a/.travis.yml b/.travis.yml index 3ddeefc96d5..d52d65032ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,21 +31,21 @@ jobs: env: - OWNER=${TRAVIS_REPO_SLUG%/*} before_install: - - sudo bash ci/travis/build/test-images before_install + - sudo bash ci/travis/build/test-images.bash before_install install: - - unbuffer bash ci/travis/build/test-images install + - unbuffer bash ci/travis/build/test-images.bash install before_script: - - unbuffer bash ci/travis/build/test-images before_script + - unbuffer bash ci/travis/build/test-images.bash before_script script: - - unbuffer bash ci/travis/build/test-images script + - unbuffer bash ci/travis/build/test-images.bash script after_success: - - unbuffer bash ci/travis/build/test-images after_success + - unbuffer bash ci/travis/build/test-images.bash after_success after_failure: - - unbuffer bash ci/travis/build/test-images after_failure + - unbuffer bash ci/travis/build/test-images.bash after_failure deploy: - provider: script skip_cleanup: true - script: unbuffer bash ci/deploy/dockerhub-test-images + script: unbuffer bash ci/deploy/dockerhub-test-images.bash on: all_branches: true @@ -61,17 +61,17 @@ jobs: - libgconf-2-4 before_install: - - bash ci/travis/unit-testing/frontend before_install + - bash ci/travis/unit-testing/frontend.bash before_install install: - - bash ci/travis/unit-testing/frontend install + - bash ci/travis/unit-testing/frontend.bash install before_script: - - bash ci/travis/unit-testing/frontend before_script + - bash ci/travis/unit-testing/frontend.bash before_script script: - - bash ci/travis/unit-testing/frontend script + - bash ci/travis/unit-testing/frontend.bash script after_success: - - bash ci/travis/unit-testing/frontend after_success + - bash ci/travis/unit-testing/frontend.bash after_success after_failure: - - bash ci/travis/unit-testing/frontend after_failure + - bash ci/travis/unit-testing/frontend.bash after_failure deploy: # https://docs.travis-ci.com/user/deployment/pages/ @@ -97,17 +97,17 @@ jobs: sudo: required cache: pip before_install: - - sudo bash ci/travis/unit-testing/webserver before_install + - sudo bash ci/travis/unit-testing/webserver.bash before_install install: - - unbuffer bash ci/travis/unit-testing/webserver install + - unbuffer bash ci/travis/unit-testing/webserver.bash install before_script: - - unbuffer bash ci/travis/unit-testing/webserver before_script + - unbuffer bash ci/travis/unit-testing/webserver.bash before_script script: - - unbuffer bash ci/travis/unit-testing/webserver script + - unbuffer bash ci/travis/unit-testing/webserver.bash script after_success: - - unbuffer bash ci/travis/unit-testing/webserver after_success + - unbuffer bash ci/travis/unit-testing/webserver.bash after_success after_failure: - - unbuffer bash ci/travis/unit-testing/webserver after_failure + - unbuffer bash ci/travis/unit-testing/webserver.bash after_failure # test python, catalog ---------------------------------------------------------------------- - stage: build / unit-testing @@ -120,17 +120,17 @@ jobs: - docker cache: pip before_install: - - sudo bash ci/travis/unit-testing/catalog before_install + - sudo bash ci/travis/unit-testing/catalog.bash before_install install: - - unbuffer bash ci/travis/unit-testing/catalog install + - unbuffer bash ci/travis/unit-testing/catalog.bash install before_script: - - unbuffer bash ci/travis/unit-testing/catalog before_script + - unbuffer bash ci/travis/unit-testing/catalog.bash before_script script: - - unbuffer bash ci/travis/unit-testing/catalog script + - unbuffer bash ci/travis/unit-testing/catalog.bash script after_success: - - unbuffer bash ci/travis/unit-testing/catalog after_success + - unbuffer bash ci/travis/unit-testing/catalog.bash after_success after_failure: - - unbuffer bash ci/travis/unit-testing/catalog after_failure + - unbuffer bash ci/travis/unit-testing/catalog.bash after_failure # test python, director ---------------------------------------------------------------------- - stage: build / unit-testing @@ -141,17 +141,17 @@ jobs: sudo: required cache: pip before_install: - - sudo bash ci/travis/unit-testing/director before_install + - sudo bash ci/travis/unit-testing/director.bash before_install install: - - unbuffer bash ci/travis/unit-testing/director install + - unbuffer bash ci/travis/unit-testing/director.bash install before_script: - - unbuffer bash ci/travis/unit-testing/director before_script + - unbuffer bash ci/travis/unit-testing/director.bash before_script script: - - unbuffer bash ci/travis/unit-testing/director script + - unbuffer bash ci/travis/unit-testing/director.bash script after_success: - - unbuffer bash ci/travis/unit-testing/director after_success + - unbuffer bash ci/travis/unit-testing/director.bash after_success after_failure: - - unbuffer bash ci/travis/unit-testing/director after_failure + - unbuffer bash ci/travis/unit-testing/director.bash after_failure # test python, sidecar ---------------------------------------------------------------------- # TODO: activate when sidecar tests are READY! @@ -163,17 +163,17 @@ jobs: # sudo: required # cache: pip # before_install: - # - sudo bash ci/travis/unit-testing/sidecar before_install + # - sudo bash ci/travis/unit-testing/sidecar.bash before_install # install: - # - bash ci/travis/unit-testing/sidecar install + # - bash ci/travis/unit-testing/sidecar.bash install # before_script: - # - bash ci/travis/unit-testing/sidecar before_script + # - bash ci/travis/unit-testing/sidecar.bash before_script # script: - # - bash ci/travis/unit-testing/sidecar script + # - bash ci/travis/unit-testing/sidecar.bash script # after_success: - # - bash ci/travis/unit-testing/sidecar after_success + # - bash ci/travis/unit-testing/sidecar.bash after_success # after_failure: - # - bash ci/travis/unit-testing/sidecar after_failure + # - bash ci/travis/unit-testing/sidecar.bash after_failure # test python, service-library ---------------------------------------------------------------------- - stage: build / unit-testing @@ -184,17 +184,17 @@ jobs: sudo: required cache: pip before_install: - - sudo bash ci/travis/unit-testing/service-library before_install + - sudo bash ci/travis/unit-testing/service-library.bash before_install install: - - bash ci/travis/unit-testing/service-library install + - bash ci/travis/unit-testing/service-library.bash install before_script: - - bash ci/travis/unit-testing/service-library before_script + - bash ci/travis/unit-testing/service-library.bash before_script script: - - bash ci/travis/unit-testing/service-library script + - bash ci/travis/unit-testing/service-library.bash script after_success: - - bash ci/travis/unit-testing/service-library after_success + - bash ci/travis/unit-testing/service-library.bash after_success after_failure: - - bash ci/travis/unit-testing/service-library after_failure + - bash ci/travis/unit-testing/service-library.bash after_failure # test python, service-library ---------------------------------------------------------------------- - stage: build / unit-testing @@ -205,17 +205,17 @@ jobs: sudo: required cache: pip before_install: - - sudo bash ci/travis/unit-testing/simcore-sdk before_install + - sudo bash ci/travis/unit-testing/simcore-sdk.bash before_install install: - - bash ci/travis/unit-testing/simcore-sdk install + - bash ci/travis/unit-testing/simcore-sdk.bash install before_script: - - bash ci/travis/unit-testing/simcore-sdk before_script + - bash ci/travis/unit-testing/simcore-sdk.bash before_script script: - - bash ci/travis/unit-testing/simcore-sdk script + - bash ci/travis/unit-testing/simcore-sdk.bash script after_success: - - bash ci/travis/unit-testing/simcore-sdk after_success + - bash ci/travis/unit-testing/simcore-sdk.bash after_success after_failure: - - bash ci/travis/unit-testing/simcore-sdk after_failure + - bash ci/travis/unit-testing/simcore-sdk.bash after_failure # test python, storage ---------------------------------------------------------------------- - stage: build / unit-testing @@ -228,17 +228,17 @@ jobs: - docker cache: pip before_install: - - sudo bash ci/travis/unit-testing/storage before_install + - sudo bash ci/travis/unit-testing/storage.bash before_install install: - - unbuffer bash ci/travis/unit-testing/storage install + - unbuffer bash ci/travis/unit-testing/storage.bash install before_script: - - unbuffer bash ci/travis/unit-testing/storage before_script + - unbuffer bash ci/travis/unit-testing/storage.bash before_script script: - - unbuffer bash ci/travis/unit-testing/storage script + - unbuffer bash ci/travis/unit-testing/storage.bash script after_success: - - unbuffer bash ci/travis/unit-testing/storage after_success + - unbuffer bash ci/travis/unit-testing/storage.bash after_success after_failure: - - unbuffer bash ci/travis/unit-testing/storage after_failure + - unbuffer bash ci/travis/unit-testing/storage.bash after_failure # test python, api ---------------------------------------------------------------------- - stage: build / unit-testing @@ -249,17 +249,17 @@ jobs: sudo: required cache: pip before_install: - - sudo bash ci/travis/unit-testing/api before_install + - sudo bash ci/travis/unit-testing/api.bash before_install install: - - unbuffer bash ci/travis/unit-testing/api install + - unbuffer bash ci/travis/unit-testing/api.bash install before_script: - - unbuffer bash ci/travis/unit-testing/api before_script + - unbuffer bash ci/travis/unit-testing/api.bash before_script script: - - unbuffer bash ci/travis/unit-testing/api script + - unbuffer bash ci/travis/unit-testing/api.bash script after_success: - - unbuffer bash ci/travis/unit-testing/api after_success + - unbuffer bash ci/travis/unit-testing/api.bash after_success after_failure: - - unbuffer bash ci/travis/unit-testing/api after_failure + - unbuffer bash ci/travis/unit-testing/api.bash after_failure # test python, linting ---------------------------------------------------------------------- - stage: build / unit-testing @@ -269,17 +269,17 @@ jobs: - "3.6" cache: pip before_install: - - sudo bash ci/travis/unit-testing/python-linting before_install + - sudo bash ci/travis/unit-testing/python-linting.bash before_install install: - - unbuffer bash ci/travis/unit-testing/python-linting install + - unbuffer bash ci/travis/unit-testing/python-linting.bash install before_script: - - unbuffer bash ci/travis/unit-testing/python-linting before_script + - unbuffer bash ci/travis/unit-testing/python-linting.bash before_script script: - - unbuffer bash ci/travis/unit-testing/python-linting script + - unbuffer bash ci/travis/unit-testing/python-linting.bash script after_success: - - unbuffer bash ci/travis/unit-testing/python-linting after_success + - unbuffer bash ci/travis/unit-testing/python-linting.bash after_success after_failure: - - unbuffer bash ci/travis/unit-testing/python-linting after_failure + - unbuffer bash ci/travis/unit-testing/python-linting.bash after_failure # integrate webserver in swarm ------------------------------------------------------------- - stage: integration-testing / system-testing @@ -290,17 +290,17 @@ jobs: sudo: required cache: pip before_install: - - sudo bash ci/travis/integration-testing/webserver before_install + - sudo bash ci/travis/integration-testing/webserver.bash before_install install: - - unbuffer bash ci/travis/integration-testing/webserver install + - unbuffer bash ci/travis/integration-testing/webserver.bash install before_script: - - unbuffer bash ci/travis/integration-testing/webserver before_script + - unbuffer bash ci/travis/integration-testing/webserver.bash before_script script: - - unbuffer bash ci/travis/integration-testing/webserver script + - unbuffer bash ci/travis/integration-testing/webserver.bash script after_success: - - unbuffer bash ci/travis/integration-testing/webserver after_success + - unbuffer bash ci/travis/integration-testing/webserver.bash after_success after_failure: - - unbuffer bash ci/travis/integration-testing/webserver after_failure + - unbuffer bash ci/travis/integration-testing/webserver.bash after_failure # integrate simcore-sdk in swarm ------------------------------------------------------------- - stage: integration-testing / system-testing @@ -311,17 +311,17 @@ jobs: sudo: required cache: pip before_install: - - sudo bash ci/travis/integration-testing/simcore-sdk before_install + - sudo bash ci/travis/integration-testing/simcore-sdk.bash before_install install: - - unbuffer bash ci/travis/integration-testing/simcore-sdk install + - unbuffer bash ci/travis/integration-testing/simcore-sdk.bash install before_script: - - unbuffer bash ci/travis/integration-testing/simcore-sdk before_script + - unbuffer bash ci/travis/integration-testing/simcore-sdk.bash before_script script: - - unbuffer bash ci/travis/integration-testing/simcore-sdk script + - unbuffer bash ci/travis/integration-testing/simcore-sdk.bash script after_success: - - unbuffer bash ci/travis/integration-testing/simcore-sdk after_success + - unbuffer bash ci/travis/integration-testing/simcore-sdk.bash after_success after_failure: - - unbuffer bash ci/travis/integration-testing/simcore-sdk after_failure + - unbuffer bash ci/travis/integration-testing/simcore-sdk.bash after_failure # system testing swarm deploy ---------------------------------------------------------------- - stage: integration-testing / system-testing @@ -332,17 +332,17 @@ jobs: - "3.6" cache: pip before_install: - - sudo bash ci/travis/system-testing/swarm-deploy before_install + - sudo bash ci/travis/system-testing/swarm-deploy.bash before_install install: - - unbuffer bash ci/travis/system-testing/swarm-deploy install + - unbuffer bash ci/travis/system-testing/swarm-deploy.bash install before_script: - - unbuffer bash ci/travis/system-testing/swarm-deploy before_script + - unbuffer bash ci/travis/system-testing/swarm-deploy.bash before_script script: - - unbuffer bash ci/travis/system-testing/swarm-deploy script + - unbuffer bash ci/travis/system-testing/swarm-deploy.bash script after_success: - - unbuffer bash ci/travis/system-testing/swarm-deploy after_success + - unbuffer bash ci/travis/system-testing/swarm-deploy.bash after_success after_failure: - - unbuffer bash ci/travis/system-testing/swarm-deploy 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 @@ -367,17 +367,17 @@ jobs: directories: - node_modules before_install: - - sudo bash ci/travis/system-testing/e2e before_install + - sudo bash ci/travis/system-testing/e2e.bash before_install install: - - unbuffer bash ci/travis/system-testing/e2e install + - unbuffer bash ci/travis/system-testing/e2e.bash install before_script: - - unbuffer bash ci/travis/system-testing/e2e before_script + - unbuffer bash ci/travis/system-testing/e2e.bash before_script script: - - unbuffer bash ci/travis/system-testing/e2e script + - unbuffer bash ci/travis/system-testing/e2e.bash script after_success: - - unbuffer bash ci/travis/system-testing/e2e after_success + - unbuffer bash ci/travis/system-testing/e2e.bash after_success after_failure: - - unbuffer bash ci/travis/system-testing/e2e after_failure + - unbuffer bash ci/travis/system-testing/e2e.bash after_failure - stage: deployment name: master @@ -390,7 +390,7 @@ jobs: script: echo "Deploy master" deploy: - provider: script - script: unbuffer bash ci/deploy/dockerhub-deploy + script: unbuffer bash ci/deploy/dockerhub-deploy.bash on: branch: master - stage: deployment @@ -404,7 +404,7 @@ jobs: script: echo "Deploy staging" deploy: - provider: script - script: unbuffer bash ci/deploy/dockerhub-deploy + script: unbuffer bash ci/deploy/dockerhub-deploy.bash on: branch: staging - stage: deployment @@ -418,7 +418,7 @@ jobs: script: echo "Deploy production version $TRAVIS_TAG" deploy: - provider: script - script: unbuffer bash ci/deploy/dockerhub-release + script: unbuffer bash ci/deploy/dockerhub-release.bash on: all_branches: true tags: true diff --git a/ci/build/test-images b/ci/build/test-images.bash similarity index 93% rename from ci/build/test-images rename to ci/build/test-images.bash index 291b7256281..b0d570eb7c5 100755 --- a/ci/build/test-images +++ b/ci/build/test-images.bash @@ -3,7 +3,7 @@ set -euo pipefail IFS=$'\n\t' -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG pull_images() { diff --git a/ci/deploy/dockerhub-deploy b/ci/deploy/dockerhub-deploy.bash similarity index 88% rename from ci/deploy/dockerhub-deploy rename to ci/deploy/dockerhub-deploy.bash index 60f541cff22..07fb5dc656a 100755 --- a/ci/deploy/dockerhub-deploy +++ b/ci/deploy/dockerhub-deploy.bash @@ -3,7 +3,7 @@ set -euo pipefail IFS=$'\n\t' -bash ci/helpers/dockerhub_login +bash ci/helpers/dockerhub_login.bash # check script needed variables if [ ! -v TAG_PREFIX ]; then @@ -12,7 +12,7 @@ if [ ! -v TAG_PREFIX ]; then fi # pull the current tested build -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG make pull-version tag-local diff --git a/ci/deploy/dockerhub-release b/ci/deploy/dockerhub-release.bash similarity index 87% rename from ci/deploy/dockerhub-release rename to ci/deploy/dockerhub-release.bash index 25e166c6fcb..2a0c6f7d6d6 100755 --- a/ci/deploy/dockerhub-release +++ b/ci/deploy/dockerhub-release.bash @@ -3,7 +3,7 @@ set -euo pipefail IFS=$'\n\t' -bash ci/helpers/dockerhub_login +bash ci/helpers/dockerhub_login.bash # check script needed variables if [ ! -v TAG_PREFIX ] || [ ! -v GIT_TAG ]; then @@ -17,7 +17,7 @@ export ORG=${DOCKER_REGISTRY} export REPO="webserver" # staging-github-DATE.GIT_SHA export TAG_PATTERN="^${TAG_PREFIX}-.+\..+" -DOCKER_IMAGE_TAG=$(./ci/helpers/find_staging_version | awk 'END{print}') || exit $? +DOCKER_IMAGE_TAG=$(./ci/helpers/find_staging_version.bash | awk 'END{print}') || exit $? export DOCKER_IMAGE_TAG make pull-version tag-local diff --git a/ci/deploy/dockerhub-test-images b/ci/deploy/dockerhub-test-images.bash similarity index 73% rename from ci/deploy/dockerhub-test-images rename to ci/deploy/dockerhub-test-images.bash index 5203c115638..b5d72de8f9c 100755 --- a/ci/deploy/dockerhub-test-images +++ b/ci/deploy/dockerhub-test-images.bash @@ -3,10 +3,10 @@ set -euo pipefail IFS=$'\n\t' -bash ci/helpers/dockerhub_login +bash ci/helpers/dockerhub_login.bash # define the local image tag -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG # push the local cache diff --git a/ci/github/helpers/setup_docker_compose.sh b/ci/github/helpers/setup_docker_compose.bash similarity index 100% rename from ci/github/helpers/setup_docker_compose.sh rename to ci/github/helpers/setup_docker_compose.bash diff --git a/ci/github/integration-testing/simcore-sdk b/ci/github/integration-testing/simcore-sdk.bash similarity index 90% rename from ci/github/integration-testing/simcore-sdk rename to ci/github/integration-testing/simcore-sdk.bash index b22e2c7f9ed..ab9fd5dd069 100755 --- a/ci/github/integration-testing/simcore-sdk +++ b/ci/github/integration-testing/simcore-sdk.bash @@ -3,11 +3,11 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd packages/simcore-sdk; pip3 install -r requirements/ci.txt; popd; pip list -v # pull the test images if registry is set up, else build the images diff --git a/ci/github/integration-testing/webserver b/ci/github/integration-testing/webserver.bash similarity index 90% rename from ci/github/integration-testing/webserver rename to ci/github/integration-testing/webserver.bash index 57b8388a68b..f0f5fc50eee 100755 --- a/ci/github/integration-testing/webserver +++ b/ci/github/integration-testing/webserver.bash @@ -4,11 +4,11 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/web/server; pip3 install -r requirements/ci.txt; popd; pip list -v make pull-version || ( (make pull-cache || true) && make build tag-version) diff --git a/ci/github/system-testing/e2e b/ci/github/system-testing/e2e.bash similarity index 95% rename from ci/github/system-testing/e2e rename to ci/github/system-testing/e2e.bash index ed426c79069..7f7ef032446 100755 --- a/ci/github/system-testing/e2e +++ b/ci/github/system-testing/e2e.bash @@ -5,7 +5,7 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG install() { @@ -24,7 +24,7 @@ install() { make .venv # shellcheck disable=SC1091 source .venv/bin/activate - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd tests/e2e; make install echo "--------------- deploying the registry..." diff --git a/ci/github/system-testing/swarm-deploy b/ci/github/system-testing/swarm-deploy.bash similarity index 91% rename from ci/github/system-testing/swarm-deploy rename to ci/github/system-testing/swarm-deploy.bash index 29f14fcc1e8..bf4c509cda7 100755 --- a/ci/github/system-testing/swarm-deploy +++ b/ci/github/system-testing/swarm-deploy.bash @@ -10,11 +10,11 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pip3 install -r tests/swarm-deploy/requirements.txt make pull-version || ( (make pull-cache || true) && make build tag-version) make .env diff --git a/ci/github/unit-testing/api b/ci/github/unit-testing/api.bash similarity index 93% rename from ci/github/unit-testing/api rename to ci/github/unit-testing/api.bash index 641de851f3a..7c885740708 100755 --- a/ci/github/unit-testing/api +++ b/ci/github/unit-testing/api.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pip3 install --requirement api/tests/requirements.txt pip list --verbose } diff --git a/ci/github/unit-testing/catalog b/ci/github/unit-testing/catalog.bash similarity index 93% rename from ci/github/unit-testing/catalog rename to ci/github/unit-testing/catalog.bash index 40114a9c2be..72c3530c91d 100755 --- a/ci/github/unit-testing/catalog +++ b/ci/github/unit-testing/catalog.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/catalog; pip3 install -r requirements/ci.txt; popd pip list --verbose } diff --git a/ci/github/unit-testing/director b/ci/github/unit-testing/director.bash similarity index 93% rename from ci/github/unit-testing/director rename to ci/github/unit-testing/director.bash index da5b8d0b195..460161bbfbb 100755 --- a/ci/github/unit-testing/director +++ b/ci/github/unit-testing/director.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/director; pip3 install -r requirements/ci.txt; popd pip list -v } diff --git a/ci/github/unit-testing/frontend b/ci/github/unit-testing/frontend.bash similarity index 100% rename from ci/github/unit-testing/frontend rename to ci/github/unit-testing/frontend.bash diff --git a/ci/github/unit-testing/python-linting b/ci/github/unit-testing/python-linting.bash similarity index 91% rename from ci/github/unit-testing/python-linting rename to ci/github/unit-testing/python-linting.bash index 1725fba9e27..b8b4d56aca6 100755 --- a/ci/github/unit-testing/python-linting +++ b/ci/github/unit-testing/python-linting.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pip3 install pylint~=2.0 # Minimal packages to pass linter pip install celery docker diff --git a/ci/github/unit-testing/service-library b/ci/github/unit-testing/service-library.bash similarity index 93% rename from ci/github/unit-testing/service-library rename to ci/github/unit-testing/service-library.bash index ee534eca3ac..d88e4d5762d 100755 --- a/ci/github/unit-testing/service-library +++ b/ci/github/unit-testing/service-library.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd packages/service-library; pip3 install -r requirements/ci.txt; popd; pip list -v } diff --git a/ci/github/unit-testing/sidecar b/ci/github/unit-testing/sidecar.bash similarity index 94% rename from ci/github/unit-testing/sidecar rename to ci/github/unit-testing/sidecar.bash index 6134c6902be..d2497350c0d 100755 --- a/ci/github/unit-testing/sidecar +++ b/ci/github/unit-testing/sidecar.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip; + bash ci/helpers/ensure_python_pip.bash; pushd services/sidecar; pip3 install -r requirements/ci.txt; popd; pip list -v } diff --git a/ci/github/unit-testing/simcore-sdk b/ci/github/unit-testing/simcore-sdk.bash similarity index 87% rename from ci/github/unit-testing/simcore-sdk rename to ci/github/unit-testing/simcore-sdk.bash index 83957e9c190..7e6105d82d4 100755 --- a/ci/github/unit-testing/simcore-sdk +++ b/ci/github/unit-testing/simcore-sdk.bash @@ -3,11 +3,11 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd packages/simcore-sdk; pip3 install -r requirements/ci.txt; popd; pip list -v } diff --git a/ci/github/unit-testing/storage b/ci/github/unit-testing/storage.bash similarity index 93% rename from ci/github/unit-testing/storage rename to ci/github/unit-testing/storage.bash index 1cdf494ee7f..5499d313d8f 100755 --- a/ci/github/unit-testing/storage +++ b/ci/github/unit-testing/storage.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/storage; pip3 install -r requirements/ci.txt; popd pip list --verbose } diff --git a/ci/github/unit-testing/webserver b/ci/github/unit-testing/webserver.bash similarity index 93% rename from ci/github/unit-testing/webserver rename to ci/github/unit-testing/webserver.bash index 0e8084d0ade..eb4e50d1e51 100755 --- a/ci/github/unit-testing/webserver +++ b/ci/github/unit-testing/webserver.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/web/server; pip3 install -r requirements/ci.txt; popd; pip list -v } diff --git a/ci/helpers/build_docker_image_tag b/ci/helpers/build_docker_image_tag.bash similarity index 94% rename from ci/helpers/build_docker_image_tag rename to ci/helpers/build_docker_image_tag.bash index 4c91246229c..eaf40510732 100755 --- a/ci/helpers/build_docker_image_tag +++ b/ci/helpers/build_docker_image_tag.bash @@ -28,6 +28,6 @@ else image_tag=$(git rev-parse --abbrev-ref HEAD) fi -slugified_name=$(exec ci/helpers/slugify_name "$image_tag") +slugified_name=$(exec ci/helpers/slugify_name.bash "$image_tag") echo "$slugified_name-testbuild-latest" diff --git a/ci/helpers/dockerhub_login b/ci/helpers/dockerhub_login.bash similarity index 100% rename from ci/helpers/dockerhub_login rename to ci/helpers/dockerhub_login.bash diff --git a/ci/helpers/ensure_python_pip b/ci/helpers/ensure_python_pip.bash similarity index 100% rename from ci/helpers/ensure_python_pip rename to ci/helpers/ensure_python_pip.bash diff --git a/ci/helpers/find_staging_version b/ci/helpers/find_staging_version.bash similarity index 96% rename from ci/helpers/find_staging_version rename to ci/helpers/find_staging_version.bash index 297e85d4115..768a69d6f57 100755 --- a/ci/helpers/find_staging_version +++ b/ci/helpers/find_staging_version.bash @@ -1,5 +1,5 @@ #!/bin/bash -# Usage: find_staging_version +# Usage: find_staging_version.bash # # returns the full image tag corresponding to the git tag name that shall be used diff --git a/ci/helpers/show_system_versions b/ci/helpers/show_system_versions.bash similarity index 100% rename from ci/helpers/show_system_versions rename to ci/helpers/show_system_versions.bash diff --git a/ci/helpers/slugify_name b/ci/helpers/slugify_name.bash similarity index 100% rename from ci/helpers/slugify_name rename to ci/helpers/slugify_name.bash diff --git a/ci/travis/build/test-images b/ci/travis/build/test-images.bash similarity index 70% rename from ci/travis/build/test-images rename to ci/travis/build/test-images.bash index be07b2a3599..2d7c7b9d29a 100755 --- a/ci/travis/build/test-images +++ b/ci/travis/build/test-images.bash @@ -3,12 +3,12 @@ set -euo pipefail IFS=$'\n\t' -export DOCKER_IMAGE_TAG=$(exec ci/travis/helpers/build_docker_image_tag) +export DOCKER_IMAGE_TAG=$(exec ci/travis/helpers/build_docker_image_tag.bash) before_install() { - bash ci/travis/helpers/update_docker; - bash ci/travis/helpers/install_docker_compose; - bash ci/helpers/show_system_versions; + bash ci/travis/helpers/update_docker.bash; + bash ci/travis/helpers/install_docker_compose.bash; + bash ci/helpers/show_system_versions.bash; env } @@ -17,11 +17,11 @@ install() { } before_script() { - bash ci/build/test-images pull_images + bash ci/build/test-images.bash pull_images } script() { - bash ci/build/test-images build_images + bash ci/build/test-images.bash build_images } after_success() { diff --git a/ci/travis/helpers/install_docker_compose b/ci/travis/helpers/install-docker-compose.bash similarity index 100% rename from ci/travis/helpers/install_docker_compose rename to ci/travis/helpers/install-docker-compose.bash diff --git a/ci/travis/helpers/test_for_changes b/ci/travis/helpers/test-for-changes.bash similarity index 95% rename from ci/travis/helpers/test_for_changes rename to ci/travis/helpers/test-for-changes.bash index 8339cc23cae..d63f741514d 100755 --- a/ci/travis/helpers/test_for_changes +++ b/ci/travis/helpers/test-for-changes.bash @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' # Usage: -# test_for_changes ^web/server webserver blah +# test-for-changes.bash ^web/server webserver blah # this will test if these regexp are part of the modified files since the branching, # or on the push commit range if running on travis diff --git a/ci/travis/helpers/update_docker b/ci/travis/helpers/update-docker.bash similarity index 100% rename from ci/travis/helpers/update_docker rename to ci/travis/helpers/update-docker.bash diff --git a/ci/travis/integration-testing/simcore-sdk b/ci/travis/integration-testing/simcore-sdk.bash similarity index 61% rename from ci/travis/integration-testing/simcore-sdk rename to ci/travis/integration-testing/simcore-sdk.bash index 72f0898ddca..e0352a31866 100755 --- a/ci/travis/integration-testing/simcore-sdk +++ b/ci/travis/integration-testing/simcore-sdk.bash @@ -3,39 +3,40 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) +export DOCKER_IMAGE_TAG FOLDER_CHECKS=(packages/ simcore-sdk storage/ simcore-sdk .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd packages/simcore-sdk; pip3 install -r requirements/ci.txt; popd; fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v # pull the test images if registry is set up, else build the images - make pull-version || ((make pull-cache || true) && make build tag-version) + make pull-version || ( (make pull-cache || true) && make build tag-version) make info-images fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=simcore_sdk --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \ @@ -46,7 +47,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/ci/travis/integration-testing/webserver b/ci/travis/integration-testing/webserver.bash similarity index 75% rename from ci/travis/integration-testing/webserver rename to ci/travis/integration-testing/webserver.bash index ca12e3c12c3..939dce244d6 100755 --- a/ci/travis/integration-testing/webserver +++ b/ci/travis/integration-testing/webserver.bash @@ -4,22 +4,23 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) +export DOCKER_IMAGE_TAG before_install() { - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash } install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/web/server; pip3 install -r requirements/ci.txt; popd; } before_script() { pip list -v - make pull-version || ((make pull-cache || true) && make build tag-version) + make pull-version || ( (make pull-cache || true) && make build tag-version) make info-images } diff --git a/ci/travis/system-testing/e2e b/ci/travis/system-testing/e2e.bash similarity index 84% rename from ci/travis/system-testing/e2e rename to ci/travis/system-testing/e2e.bash index 807d1cbcbbe..1cddf0ff10d 100644 --- a/ci/travis/system-testing/e2e +++ b/ci/travis/system-testing/e2e.bash @@ -5,12 +5,13 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) +export DOCKER_IMAGE_TAG before_install() { - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash sudo apt install -y postgresql-client } @@ -20,7 +21,7 @@ install() { before_script() { echo "--------------- getting simcore docker images..." - make pull-version || ((make pull-cache || true) && make build tag-version) + make pull-version || ( (make pull-cache || true) && make build tag-version) make info-images # configure simcore for testing with a private registry bash tests/e2e/setup_env_insecure_registry @@ -31,7 +32,7 @@ before_script() { # create a python venv and activate make .venv source .venv/bin/activate - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd tests/e2e; make install echo "--------------- deploying the registry..." diff --git a/ci/travis/system-testing/swarm-deploy b/ci/travis/system-testing/swarm-deploy.bash similarity index 82% rename from ci/travis/system-testing/swarm-deploy rename to ci/travis/system-testing/swarm-deploy.bash index 52c5f803dfc..6a4699a8ca5 100755 --- a/ci/travis/system-testing/swarm-deploy +++ b/ci/travis/system-testing/swarm-deploy.bash @@ -10,17 +10,17 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) export DOCKER_IMAGE_TAG before_install() { - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash } install() { - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pip3 install -r tests/swarm-deploy/requirements.txt make pull-version || ( (make pull-cache || true) && make build tag-version) make .env diff --git a/ci/travis/unit-testing/api b/ci/travis/unit-testing/api.bash similarity index 62% rename from ci/travis/unit-testing/api rename to ci/travis/unit-testing/api.bash index fac4cfd05f7..ffd77c46de2 100755 --- a/ci/travis/unit-testing/api +++ b/ci/travis/unit-testing/api.bash @@ -6,31 +6,31 @@ IFS=$'\n\t' FOLDER_CHECKS=(api/ .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pip3 install --requirement api/tests/requirements.txt fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list --verbose fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=api --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \ @@ -41,7 +41,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/ci/travis/unit-testing/catalog b/ci/travis/unit-testing/catalog.bash similarity index 64% rename from ci/travis/unit-testing/catalog rename to ci/travis/unit-testing/catalog.bash index e6a8f6afdeb..e4d91aa3f61 100755 --- a/ci/travis/unit-testing/catalog +++ b/ci/travis/unit-testing/catalog.bash @@ -6,31 +6,31 @@ IFS=$'\n\t' FOLDER_CHECKS=(api/ catalog packages/ .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/helpers/show_system_versions - bash ci/travis/helpers/install_docker_compose + bash ci/travis/helpers/update-docker.bash + bash ci/helpers/show_system_versions.bash + bash ci/travis/helpers/install-docker-compose.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/catalog; pip3 install -r requirements/ci.txt; popd fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=simcore_service_catalog --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml \ @@ -41,7 +41,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls codecov diff --git a/ci/travis/unit-testing/director b/ci/travis/unit-testing/director.bash similarity index 64% rename from ci/travis/unit-testing/director rename to ci/travis/unit-testing/director.bash index f2d1b3f2a70..bd50915f0d0 100755 --- a/ci/travis/unit-testing/director +++ b/ci/travis/unit-testing/director.bash @@ -6,31 +6,31 @@ IFS=$'\n\t' FOLDER_CHECKS=(api/ director packages/ .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/director; pip3 install -r requirements/ci.txt; popd fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=simcore_service_director --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \ @@ -41,7 +41,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/ci/travis/unit-testing/frontend b/ci/travis/unit-testing/frontend.bash similarity index 87% rename from ci/travis/unit-testing/frontend rename to ci/travis/unit-testing/frontend.bash index 3be6f08733a..572089b3551 100755 --- a/ci/travis/unit-testing/frontend +++ b/ci/travis/unit-testing/frontend.bash @@ -6,14 +6,14 @@ IFS=$'\n\t' FOLDER_CHECKS=(js eslintrc json .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/show_system_versions + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then npm install make -C services/web/client clean @@ -21,7 +21,7 @@ install() { } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then npx eslint --version make -C services/web/client info @@ -29,7 +29,7 @@ before_script() { } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then echo "# Running Linter" npm run linter diff --git a/ci/travis/unit-testing/python-linting b/ci/travis/unit-testing/python-linting.bash similarity index 65% rename from ci/travis/unit-testing/python-linting rename to ci/travis/unit-testing/python-linting.bash index 4a9527669ea..41fd0e6db21 100755 --- a/ci/travis/unit-testing/python-linting +++ b/ci/travis/unit-testing/python-linting.bash @@ -6,16 +6,16 @@ IFS=$'\n\t' FOLDER_CHECKS=(.py .pylintrc .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/show_system_versions + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pip3 install pylint~=2.0 # Minimal packages to pass linter pip install celery docker @@ -23,7 +23,7 @@ install() { } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v pylint --version @@ -31,7 +31,7 @@ before_script() { } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then make pylint else @@ -40,7 +40,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then echo "linting successful" fi diff --git a/ci/travis/unit-testing/service-library b/ci/travis/unit-testing/service-library.bash similarity index 63% rename from ci/travis/unit-testing/service-library rename to ci/travis/unit-testing/service-library.bash index 54a883185e9..1a0934ee808 100755 --- a/ci/travis/unit-testing/service-library +++ b/ci/travis/unit-testing/service-library.bash @@ -6,31 +6,31 @@ IFS=$'\n\t' FOLDER_CHECKS=(packages/ service-library .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd packages/service-library; pip3 install -r requirements/ci.txt; popd; fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=servicelib --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \ @@ -41,7 +41,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/ci/travis/unit-testing/sidecar b/ci/travis/unit-testing/sidecar.bash similarity index 63% rename from ci/travis/unit-testing/sidecar rename to ci/travis/unit-testing/sidecar.bash index 097c2394f66..e46b2be3919 100755 --- a/ci/travis/unit-testing/sidecar +++ b/ci/travis/unit-testing/sidecar.bash @@ -6,31 +6,31 @@ IFS=$'\n\t' FOLDER_CHECKS=(api/ sidecar packages/ .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip; + bash ci/helpers/ensure_python_pip.bash; pushd services/sidecar; pip3 install -r requirements/ci.txt; popd; fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then # TODO: call services/sidecar/tests/unit when integration tests available pytest --cov=simcore_service_sidecar --durations=10 --cov-append \ @@ -42,7 +42,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/ci/travis/unit-testing/simcore-sdk b/ci/travis/unit-testing/simcore-sdk.bash similarity index 62% rename from ci/travis/unit-testing/simcore-sdk rename to ci/travis/unit-testing/simcore-sdk.bash index 84c64cb2b63..a4dea46a734 100755 --- a/ci/travis/unit-testing/simcore-sdk +++ b/ci/travis/unit-testing/simcore-sdk.bash @@ -3,36 +3,37 @@ set -euo pipefail IFS=$'\n\t' # in case it's a Pull request, the env are never available, default to itisfoundation to get a maybe not too old version for caching -export DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag) +DOCKER_IMAGE_TAG=$(exec ci/helpers/build_docker_image_tag.bash) +export DOCKER_IMAGE_TAG FOLDER_CHECKS=(packages/ simcore-sdk storage/ simcore-sdk .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd packages/simcore-sdk; pip3 install -r requirements/ci.txt; popd; fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=simcore_sdk --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \ @@ -44,7 +45,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/ci/travis/unit-testing/storage b/ci/travis/unit-testing/storage.bash similarity index 64% rename from ci/travis/unit-testing/storage rename to ci/travis/unit-testing/storage.bash index 763f5359c75..45a1e2973cb 100755 --- a/ci/travis/unit-testing/storage +++ b/ci/travis/unit-testing/storage.bash @@ -6,31 +6,31 @@ IFS=$'\n\t' FOLDER_CHECKS=(api/ storage packages/ .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/helpers/show_system_versions - bash ci/travis/helpers/install_docker_compose + bash ci/travis/helpers/update-docker.bash + bash ci/helpers/show_system_versions.bash + bash ci/travis/helpers/install-docker-compose.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/storage; pip3 install -r requirements/ci.txt; popd fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=simcore_service_storage --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \ @@ -41,7 +41,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/ci/travis/unit-testing/webserver b/ci/travis/unit-testing/webserver.bash similarity index 65% rename from ci/travis/unit-testing/webserver rename to ci/travis/unit-testing/webserver.bash index a3eb2efdcfa..2ba10c9194e 100755 --- a/ci/travis/unit-testing/webserver +++ b/ci/travis/unit-testing/webserver.bash @@ -6,31 +6,31 @@ IFS=$'\n\t' FOLDER_CHECKS=(api/ webserver packages/ services/web .travis.yml) before_install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/travis/helpers/update_docker - bash ci/travis/helpers/install_docker_compose - bash ci/helpers/show_system_versions + bash ci/travis/helpers/update-docker.bash + bash ci/travis/helpers/install-docker-compose.bash + bash ci/helpers/show_system_versions.bash fi } install() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then - bash ci/helpers/ensure_python_pip + bash ci/helpers/ensure_python_pip.bash pushd services/web/server; pip3 install -r requirements/ci.txt; popd; fi } before_script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pip list -v fi } script() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then pytest --cov=simcore_service_webserver --durations=10 --cov-append \ --color=yes --cov-report=term-missing --cov-report=xml --cov-config=.coveragerc \ @@ -41,7 +41,7 @@ script() { } after_success() { - if bash ci/travis/helpers/test_for_changes "${FOLDER_CHECKS[@]}"; + if bash ci/travis/helpers/test-for-changes.bash "${FOLDER_CHECKS[@]}"; then coveralls fi diff --git a/scripts/url-encoder.sh b/scripts/url-encoder.sh old mode 100644 new mode 100755