From c867388eccfc8a3c15e340e97994f2ee350b2543 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Thu, 29 Feb 2024 10:26:15 +1100 Subject: [PATCH] removed debug --- .drevops/tests/bats/circleci.bats | 2 +- .github/workflows/drevops-test-common.yml | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.drevops/tests/bats/circleci.bats b/.drevops/tests/bats/circleci.bats index 312aaba60..84145ee18 100644 --- a/.drevops/tests/bats/circleci.bats +++ b/.drevops/tests/bats/circleci.bats @@ -8,7 +8,7 @@ load _helper.bash load _helper.circleci.bash @test "CircleCI artifacts are saved" { - if [ -z "${CI}" ]; then + if [ -z "${CIRCLECI}" ]; then skip "This test is only run on CircleCI" fi diff --git a/.github/workflows/drevops-test-common.yml b/.github/workflows/drevops-test-common.yml index 3aa7e2c9e..4f80cd1c8 100644 --- a/.github/workflows/drevops-test-common.yml +++ b/.github/workflows/drevops-test-common.yml @@ -10,7 +10,7 @@ on: - 'feature/**' jobs: - test-scaffold: + drevops-test-common: runs-on: ubuntu-latest container: @@ -22,7 +22,6 @@ jobs: TEST_DOCKER_USER: ${{ secrets.TEST_DOCKER_USER }} TEST_DOCKER_PASS: ${{ secrets.TEST_DOCKER_PASS }} DOCKER_CONFIG: /root/.docker - HOME: /root steps: - name: Checkout code @@ -45,22 +44,16 @@ jobs: # - name: Setup upterm session # uses: lhotari/action-upterm@v1 - run: | - export DOCKER_CONFIG=/root/.docker cat /etc/debian_version env docker version docker compose version - env: - DOCKER_CONFIG: /root/.docker - name: Run tests run: | - export DOCKER_CONFIG=/root/.docker git config --global safe.directory '*' ./tests/test.common.sh working-directory: .drevops - env: - DOCKER_CONFIG: /root/.docker - name: Upload coverage report as an artifact uses: actions/upload-artifact@v4