diff --git a/.github/workflows/acceptance_test_cd.yml b/.github/workflows/acceptance_test_cd.yml index 1d333a8..8fa9902 100644 --- a/.github/workflows/acceptance_test_cd.yml +++ b/.github/workflows/acceptance_test_cd.yml @@ -5,15 +5,15 @@ on: workflow_dispatch: # Run the test when the new PR to develop is created - pull_request: - branches: - - develop - paths: - - 'backend/**' - - 'frontend/**' - - 'k8s/staging/**' - - 'infrastructure/staging/**' - - '.github/workflows/*staging*.yml' + # pull_request: + # branches: + # - develop + # paths: + # - 'backend/**' + # - 'frontend/**' + # - 'k8s/staging/**' + # - 'infrastructure/staging/**' + # - '.github/workflows/*staging*.yml' env: PYTHON_VERSION: "3.10" diff --git a/.github/workflows/cd-staging-deploy.yml b/.github/workflows/cd-staging-deploy.yml index 08f4420..c675605 100644 --- a/.github/workflows/cd-staging-deploy.yml +++ b/.github/workflows/cd-staging-deploy.yml @@ -16,6 +16,7 @@ on: env: SHARED_ACR_LOGIN_SERVER: ${{ secrets.SHARED_ACR_LOGIN_SERVER }} + SHARED_ACR_NAME: ${{ secrets.SHARED_ACR_NAME }} RESOURCE_GROUP_STAGING: sit722alice-staging-rg AKS_CLUSTER_STAGING: sit722alice-staging-aks @@ -53,7 +54,7 @@ jobs: echo "GIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT echo "IMAGE_TAG=staging-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - name: Build Backend Images (Notes Service) + - name: Build Backend Images id: backend_images run: | NOTES_SERVICE_IMAGE="notes_service:${{ steps.vars.outputs.IMAGE_TAG }}" @@ -61,9 +62,9 @@ jobs: docker build -t ${{ env.SHARED_ACR_LOGIN_SERVER }}/$NOTES_SERVICE_IMAGE ./backend/notes_service docker build -t ${{ env.SHARED_ACR_LOGIN_SERVER }}/$USERS_SERVICE_IMAGE ./backend/users_service - - echo "notes_service=$NOTES_SERVICE_IMAGE" >> $GITHUB_OUTPUT - echo "users_service=$USERS_SERVICE_IMAGE" >> $GITHUB_OUTPUT + + echo "notes_service_image=$NOTES_SERVICE_IMAGE" >> $GITHUB_OUTPUT + echo "users_service_image=$USERS_SERVICE_IMAGE" >> $GITHUB_OUTPUT # Image Vulnerability Scan with Trivy security-scan: diff --git a/.github/workflows/feature_test_notes_service.yml b/.github/workflows/feature_test_notes_service.yml index 80991c2..8f86c9c 100644 --- a/.github/workflows/feature_test_notes_service.yml +++ b/.github/workflows/feature_test_notes_service.yml @@ -14,9 +14,9 @@ on: - ".github/workflows/*notes_service*.yml" # Re-run the test when the new PR to develop is created - pull_request: - branches: - - "develop" + # pull_request: + # branches: + # - "develop" jobs: quality-checks: diff --git a/.github/workflows/feature_test_users_service.yml b/.github/workflows/feature_test_users_service.yml index 6935012..070d51a 100644 --- a/.github/workflows/feature_test_users_service.yml +++ b/.github/workflows/feature_test_users_service.yml @@ -14,9 +14,9 @@ on: - ".github/workflows/*users_service*.yml" # Re-run the test when the new PR to develop is created - pull_request: - branches: - - "develop" + # pull_request: + # branches: + # - "develop" jobs: quality-checks: