From 29086efd9b080189e9ea533875d5c5ef694f4900 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Fri, 21 May 2021 15:41:06 +0200 Subject: [PATCH] install nose --- .github/scripts/python-pkg-install.sh | 3 ++- .github/scripts/python-pkg-test.sh | 4 ++-- .github/workflows/test-all-Ubuntu.yml | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/scripts/python-pkg-install.sh b/.github/scripts/python-pkg-install.sh index 861bf47cf..b0d6777ab 100755 --- a/.github/scripts/python-pkg-install.sh +++ b/.github/scripts/python-pkg-install.sh @@ -1,6 +1,7 @@ #/bin/bash +pip3 install nose pip3 install -e python_apps/airtime_analyzer/. pip3 install -e python_apps/airtime-celery/. pip3 install -e python_apps/api_clients/. -pip3 install -e python_apps/pypo/. \ No newline at end of file +pip3 install -e python_apps/pypo/. diff --git a/.github/scripts/python-pkg-test.sh b/.github/scripts/python-pkg-test.sh index a6918a66c..55f1249c2 100755 --- a/.github/scripts/python-pkg-test.sh +++ b/.github/scripts/python-pkg-test.sh @@ -8,14 +8,14 @@ cd python_apps/airtime_analyzer if ! nosetests . -x; then failed='t' fi -echo "::endgroup" +echo "::endgroup::" echo "::group::API Client" cd ../api_clients if ! nosetests . -x; then failed='t' fi -echo "::endgroup" +echo "::endgroup::" # Reset to repo root cd ../.. diff --git a/.github/workflows/test-all-Ubuntu.yml b/.github/workflows/test-all-Ubuntu.yml index 33fdd1326..4f57df8a4 100644 --- a/.github/workflows/test-all-Ubuntu.yml +++ b/.github/workflows/test-all-Ubuntu.yml @@ -14,6 +14,9 @@ jobs: runs-on: ubuntu-18.04 strategy: fail-fast: false + env: + ENVIRONMENT: testing + LIBRETIME_LOG_DIR: /tmp/log/libretime steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -32,12 +35,11 @@ jobs: with: php-version: '7.2' - name: Install prerequisites - run: | - ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime - sudo bash ./.github/scripts/install-bionic.sh + run: + sudo ./.github/scripts/install-bionic.sh - name: Run Python tests run: | - sudo bash ./.github/scripts/python-pkg-install.sh + sudo ./.github/scripts/python-pkg-install.sh ./.github/scripts/python-pkg-test.sh - name: Run PHP tests run: | @@ -48,6 +50,9 @@ jobs: runs-on: ubuntu-16.04 strategy: fail-fast: false + env: + ENVIRONMENT: testing + LIBRETIME_LOG_DIR: /tmp/log/libretime steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -66,13 +71,11 @@ jobs: with: php-version: '7.0' - name: Install prerequisites - run: | - ENVIRONMENT=testing && LIBRETIME_LOG_DIR=/tmp/log/libretime - sudo bash ./.github/scripts/install-xenial.sh + run: sudo ./.github/scripts/install-xenial.sh - name: Run Python tests run: | pip install --upgrade pip - sudo bash ./.github/scripts/python-pkg-install.sh + sudo ./.github/scripts/python-pkg-install.sh ./.github/scripts/python-pkg-test.sh - name: Run PHP tests run: |