From 056a9374369764105785e02056d12f14a83558c3 Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 27 Aug 2024 12:58:34 +0100 Subject: [PATCH 1/5] fix docker job for ur deploys --- .github/workflows/dispatch_deploy_to_ur_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dispatch_deploy_to_ur_environment.yml b/.github/workflows/dispatch_deploy_to_ur_environment.yml index 61d2a5d19b..e086618d3d 100644 --- a/.github/workflows/dispatch_deploy_to_ur_environment.yml +++ b/.github/workflows/dispatch_deploy_to_ur_environment.yml @@ -53,7 +53,7 @@ jobs: uses: ./.github/workflows/docker_job.yml with: tag: ur-${{ inputs.tag_to_deploy }} - checkout_tag : ${{ inputs.tag_to_deploy }} + branch_name: ${{ github.head_ref }} ui_tests_image: name: Run Cypress UI Tests On ur Images From 56508652000919c69d3741ab5092e69d6292651f Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 27 Aug 2024 14:20:05 +0100 Subject: [PATCH 2/5] match pr specs pattern --- .github/workflows/dispatch_deploy_to_ur_environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dispatch_deploy_to_ur_environment.yml b/.github/workflows/dispatch_deploy_to_ur_environment.yml index e086618d3d..33758365de 100644 --- a/.github/workflows/dispatch_deploy_to_ur_environment.yml +++ b/.github/workflows/dispatch_deploy_to_ur_environment.yml @@ -63,7 +63,7 @@ jobs: run_against_image: true tag: ur-${{ inputs.tag_to_deploy}} checkout_tag: ${{ inputs.tag_to_deploy}} - specs: 'cypress/e2e/**/*.js' + specs: 'cypress/e2e/**/*.cy.js' secrets: aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID_ACTIONS }} aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY_ACTIONS }} From ffed5cf561916222b2b9d431439e7b8ace01af40 Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 27 Aug 2024 17:02:08 +0100 Subject: [PATCH 3/5] pin mock-onelogin to working version --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ed4b410f69..8f097b4dc8 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -105,7 +105,7 @@ services: - "8081:8080" mock-onelogin: - image: 311462405659.dkr.ecr.eu-west-1.amazonaws.com/mock-onelogin:latest + image: 311462405659.dkr.ecr.eu-west-1.amazonaws.com/mock-onelogin:v0.75.0 container_name: mock-onelogin ports: - "7012:8080" From 219236db719c3564cb8b1d50f578e114faf45d5b Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Tue, 27 Aug 2024 17:13:21 +0100 Subject: [PATCH 4/5] leave checkout tag in place --- .github/workflows/dispatch_deploy_to_ur_environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dispatch_deploy_to_ur_environment.yml b/.github/workflows/dispatch_deploy_to_ur_environment.yml index 33758365de..63fd2df3a7 100644 --- a/.github/workflows/dispatch_deploy_to_ur_environment.yml +++ b/.github/workflows/dispatch_deploy_to_ur_environment.yml @@ -53,6 +53,7 @@ jobs: uses: ./.github/workflows/docker_job.yml with: tag: ur-${{ inputs.tag_to_deploy }} + checkout_tag : ${{ inputs.tag_to_deploy }} branch_name: ${{ github.head_ref }} ui_tests_image: From f0b110c81da2f3b0c982714fda72caf0568d5009 Mon Sep 17 00:00:00 2001 From: Andrew Pearce Date: Wed, 28 Aug 2024 10:31:45 +0100 Subject: [PATCH 5/5] continue to use latest docker image --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8f097b4dc8..ed4b410f69 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -105,7 +105,7 @@ services: - "8081:8080" mock-onelogin: - image: 311462405659.dkr.ecr.eu-west-1.amazonaws.com/mock-onelogin:v0.75.0 + image: 311462405659.dkr.ecr.eu-west-1.amazonaws.com/mock-onelogin:latest container_name: mock-onelogin ports: - "7012:8080"