From 1b982f16baa62972cbf770c96bed1ad59a55c763 Mon Sep 17 00:00:00 2001 From: Emterry Date: Wed, 4 Dec 2024 17:22:49 +0000 Subject: [PATCH] debug --- .github/workflows/test.yml | 25 ------------------------- Makefile | 3 ++- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e412b74..15e9ca36 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,16 +33,6 @@ jobs: with: version: latest endpoint: builders - - # - name: Install Docker Compose - # id: docker-compose - # shell: bash - # env: - # IMAGE_TAG: ${{ github.sha }} - # run: | - # sudo curl -L "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose - # sudo chmod +x /usr/local/bin/docker-compose - # docker-compose --version - name: Build with Docker Compose id: build @@ -51,14 +41,6 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | make build - - - name: Log in to GitHub Container Registry - id: ghcr_login - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 @@ -66,13 +48,6 @@ jobs: aws-region: eu-west-1 role-to-assume: arn:aws:iam::593291632749:role/github-actions-management-ecr role-duration-seconds: 1200 - - # - name: Push - # id: push - # env: - # IMAGE_NAME: ghcr.io/ministryofjustice/analytics-platform-control-panel - # run: | - # docker push $IMAGE_NAME:${{ github.sha }} - name: Run tests env: diff --git a/Makefile b/Makefile index fce935d7..9a3cac41 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,8 @@ test-python: DJANGO_SETTINGS_MODULE=controlpanel.settings.test test-python: @echo @echo "> Running Python Tests (In Docker)..." - @docker-compose run --rm -e KUBECONFIG=tests/kubeconfig frontend sh -c "pytest tests --color=yes" + @docker-compose run --rm -e KUBECONFIG=tests/kubeconfig \ + frontend sh -c "pytest tests --color=yes" ## test: Run tests in Docker container test: test-python