Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/acceptance_test_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ on:
- ".github/workflows/*acceptance*.yml"

# Run the test when the new PR to develop or main is created
# pull_request:
# branches:
# - develop
# - main
# paths:
# - 'backend/**'
# - 'frontend/**'
# - 'k8s/staging/**'
# - 'infrastructure/staging/**'
# - '.github/workflows/*staging*.yml'
pull_request:
branches:
- develop
- main
paths:
- 'backend/**'
- 'frontend/**'
- 'k8s/staging/**'
- 'infrastructure/staging/**'
- '.github/workflows/*staging*.yml'

env:
PYTHON_VERSION: "3.10"
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/cd-production-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@ jobs:
FRONTEND_IMAGE="frontend:${{ steps.vars.outputs.IMAGE_TAG }}"

# Semantic version images
NOTES_SERVICE_IMAGE_VERSION="notes_service:${{ inputs.version }}"
USERS_SERVICE_IMAGE_VERSION="users_service:${{ inputs.version }}"
FRONTEND_IMAGE_VERSION="frontend:${{ inputs.version }}"
VERSION=${{ inputs.version }}
if [[ -z "$VERSION" ]]; then
VERSION=latest
NOTES_SERVICE_IMAGE_VERSION="notes_service:$VERSION"
USERS_SERVICE_IMAGE_VERSION="users_service:$VERSION"
FRONTEND_IMAGE_VERSION="frontend:$VERSION"

# Build local images for scanning
docker build -t $NOTES_SERVICE_IMAGE -t $NOTES_SERVICE_IMAGE_VERSION ./backend/notes_service
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/cd-staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,19 +339,19 @@ jobs:
run: |
echo "Cleaning up staging"

# - name: Log in to Azure
# uses: azure/login@v1
# with:
# creds: {{ secrets.AZURE_CREDENTIALS }}
# enable-AzPSSession: true

# - name: Delete staging environment
# run: |
# az group delete \
# --name {{ env.RESOURCE_GROUP_STAGING }} \
# --yes \
# --no-wait
- name: Log in to Azure
uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}
enable-AzPSSession: true

- name: Delete staging environment
run: |
az group delete \
--name {{ env.RESOURCE_GROUP_STAGING }} \
--yes \
--no-wait

# - name: Logout from Azure
# run: az logout
- name: Logout from Azure
run: az logout

8 changes: 4 additions & 4 deletions .github/workflows/feature_test_notes_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ on:
- ".github/workflows/*notes_service*.yml"

# Re-run the test when the new PR to develop is created
# pull_request:
# branches:
# - develop
# - main
pull_request:
branches:
- develop
- main

jobs:
quality-checks:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/feature_test_users_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ on:
- ".github/workflows/*users_service*.yml"

# Re-run the test when the new PR to develop is created
# pull_request:
# branches:
# - develop
# - main
pull_request:
branches:
- develop
- main

jobs:
quality-checks:
Expand Down
2 changes: 1 addition & 1 deletion playwright-python/tests/test_acceptance.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def browser_context_args(browser_context_args):
"ignore_https_errors": True,
}

@pytest.mark.smoke
@pytest.mark.acceptance
class TestEndToEndUserFlow:
"""Acceptance testing to verify correct end-to-end user flow."""

Expand Down