From 01bcd3671f719a5a4f4a957f662a5e7d3aa546e6 Mon Sep 17 00:00:00 2001 From: chinelo-obitube Date: Thu, 11 Jul 2024 12:20:09 +0200 Subject: [PATCH] fix failing script --- .github/workflows/ci-tests.yaml | 47 ++++++++++--- .github/workflows/testing.yaml | 118 -------------------------------- 2 files changed, 36 insertions(+), 129 deletions(-) delete mode 100644 .github/workflows/testing.yaml diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml index aa54003f1e..b122a9100f 100644 --- a/.github/workflows/ci-tests.yaml +++ b/.github/workflows/ci-tests.yaml @@ -78,12 +78,29 @@ jobs: sleep 10 touch tmp/parallel_runtime_test.log chmod +w tmp/parallel_runtime_test.log + - name: Run Functional Tests id: run-tests env: TEST_RETRY_COUNT: 3 run: | docker-compose exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -T -e PATTERN='models mailers integration workers lib contract' api test/run-tests.sh + + - name: After functional Tests + id: after-functional-tests + env: + GIT_SHA: ${{ github.sha }} + GIT_COMMITED_AT: ${{ github.event.head_commit.timestamp }} + run: | + docker-compose exec -T -e GIT_COMMIT_SHA=${{ github.sha }} \ + -e GIT_COMMITTED_AT=${{ github.event.head_commit.timestamp }} \ + -e CC_TEST_REPORTER_ID=$CC_TEST_REPORTER_ID \ + -e PATH=$PATH \ + -e JOB_NAME=functional-tests \ + -e AWS_CONFIG_FILE=/app/credentials \ + api test/test-coverage.sh + + unit-tests: runs-on: ubuntu-latest @@ -155,6 +172,20 @@ jobs: TEST_RETRY_COUNT: 3 run: | docker-compose exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -T -e PATTERN='controllers contract' api test/run-tests.sh + - name: After unit Tests + id: unit-tests + env: + GIT_SHA: ${{ github.sha }} + GIT_COMMITED_AT: ${{ github.event.head_commit.timestamp }} + run: | + docker-compose exec -T -e GIT_COMMIT_SHA=${{ github.sha }} \ + -e GIT_COMMITTED_AT=${{ github.event.head_commit.timestamp }} \ + -e CC_TEST_REPORTER_ID=$CC_TEST_REPORTER_ID \ + -e PATH=$PATH \ + -e JOB_NAME=unit-tests \ + -e AWS_CONFIG_FILE=/app/credentials \ + api test/test-coverage.sh + contract-tests: runs-on: ubuntu-latest @@ -221,21 +252,15 @@ jobs: sleep 10 touch tmp/parallel_runtime_test.log chmod +w tmp/parallel_runtime_test.log + - name: Run Contract Tests id: run-tests env: TEST_RETRY_COUNT: 3 run: | docker-compose exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -T -e PATTERN='controllers models mailers integration workers lib' api test/run-tests.sh - - after_script: - needs: [functional-tests, unit-tests, contract-tests] - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: After PR Tests + + - name: After contract Tests id: after-tests env: GIT_SHA: ${{ github.sha }} @@ -245,6 +270,6 @@ jobs: -e GIT_COMMITTED_AT=${{ github.event.head_commit.timestamp }} \ -e CC_TEST_REPORTER_ID=$CC_TEST_REPORTER_ID \ -e PATH=$PATH \ - -e JOB_NAME=functional_tests \ + -e JOB_NAME=contract-tests \ -e AWS_CONFIG_FILE=/app/credentials \ - api test/test-coverage.sh \ No newline at end of file + api test/test-coverage.sh diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml deleted file mode 100644 index 9731c08161..0000000000 --- a/.github/workflows/testing.yaml +++ /dev/null @@ -1,118 +0,0 @@ -name: Build and Run Function, Unit and Contract Tests - -on: - push: - branches: - - master - - cv2-4793-identify-required-workflows - pull_request: - branches: - - develop - -env: - CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}" - -jobs: - tests: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} - aws-region: eu-west-1 - - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: set up enviroments - run: | - export RECORD_RUNTIME=true - export LC_ALL=C.UTF-8 - export LANG=C.UTF-8 - export LANGUAGE=C.UTF-8 - export PATH=/root/.local/bin:$PATH - rm -rf tmp/cache tmp/cache1 tmp/cache2 tmp/cache3 tmp/cache4 tmp/cache5 && mkdir -p tmp/cache tmp/cache1 tmp/cache2 tmp/cache3 tmp/cache4 tmp/cache5 - - - name: set up comfiguration files - run: | - cp config/config.yml.example config/config.yml - cp config/database.yml.example config/database.yml - cp config/sidekiq.yml.example config/sidekiq.yml - cp config/credentials.json.example config/credentials.json - cp config/sidekiq-test.yml.example config/sidekiq-test.yml - - - name: Build Docker Container - run: | - docker-compose build - - - name: Run syntax checks - run: | - docker-compose run api bash -c 'touch /tmp/no-syntax-errors && find app lib config -name *.rb -exec bash -c "ruby -c {} >/dev/null || rm /tmp/no-syntax-errors" ";" && ls /tmp/no-syntax-errors' - - - name: Run Container - run: docker-compose -f docker-compose.yml -f docker-test.yml up -d - - - name: Wait for the server to be ready - run: | - tail -f log/test.log & - until curl --silent -I -f --fail http://localhost:3000 ; do printf .; sleep 1; done - - - name: Set up parallel environment - run: docker-compose exec -T api test/setup-parallel-env.sh - - - name: Precompile assets - run: docker-compose exec -T api bundle exec rake assets:precompile - - - name: Prepare parallel runtime log - run: | - sleep 10 - touch tmp/parallel_runtime_test.log - chmod +w tmp/parallel_runtime_test.log - - - name: Run Functional Tests - id: functional-tests - env: - TEST_RETRY_COUNT: 3 - run: | - docker-compose exec -T -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -T -e PATTERN='models mailers integration workers lib contract' api test/run-tests.sh - - - name: Run Unit Tests - id: unit-tests - env: - TEST_RETRY_COUNT: 3 - run: | - docker-compose exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -T -e PATTERN='controllers contract' api test/run-tests.sh - - - name: Run Contract Tests - id: run-tests - env: - TEST_RETRY_COUNT: 3 - run: | - docker-compose exec -e TEST_RETRY_COUNT=$TEST_RETRY_COUNT -T -e PATTERN='controllers models mailers integration workers lib' api test/run-tests.sh - - - name: After PR Tests - id: after-tests - env: - GIT_SHA: ${{ github.sha }} - GIT_COMMITED_AT: ${{ github.event.head_commit.timestamp }} - run: | - docker-compose exec -T -e GIT_COMMIT_SHA=${{ github.sha }} \ - -e GIT_COMMITTED_AT=${{ github.event.head_commit.timestamp }} \ - -e CC_TEST_REPORTER_ID=$CC_TEST_REPORTER_ID \ - -e PATH=$PATH \ - -e JOB_NAME=functional_tests \ - -e AWS_CONFIG_FILE=/app/credentials \ - api test/test-coverage.sh \ No newline at end of file