Commit ca8f3900 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/cicd' into 'master' 

cicd: multiple fixes

Closes #16

See merge request to-be-continuous/kicker!399
parents 5b708c01 24811d4a

.gitlab-ci.yml

+5 −19
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ include: 
    - project: '$TBC_NAMESPACE/angular'

      ref: '4'

      file: '/templates/gitlab-ci-angular.yml'

    # Playwright template

    - project: 'to-be-continuous/playwright'

      ref: '1.4.0'

      file: '/templates/gitlab-ci-playwright.yml'

    # # Playwright template

    # - project: 'to-be-continuous/playwright'

    #   ref: '1.4.0'

    #   file: '/templates/gitlab-ci-playwright.yml'

    # S3 template

    - project: '$TBC_NAMESPACE/s3'

      ref: '7'
@@ -23,21 +23,7 @@ variables: 
    S3_STAGING_DISABLED: 'true'

    S3_REVIEW_PREFIX: ${CI_COMMIT_REF_SLUG}

    PLAYWRIGHT_IMAGE: 'mcr.microsoft.com/playwright:v1.45.2-jammy'



stages:

    - build

    - test

    - acceptance

    - deploy

    - publish

    - production



playwright:

    script:

        - mkdir -p -m 777 reports

        - npx playwright install chrome

        - npx playwright install msedge

        - PLAYWRIGHT_JUNIT_OUTPUT_NAME=reports/playwright.xunit.xml npx playwright test ${TRACE+--debug} --reporter=junit $PLAYWRIGHT_EXTRA_ARGS

    REVIEW_ENABLED: "true"



# override Angular build job to run build only (no tests)

ng-build:

pre-playwright.sh

0 → 100644
+3 −0
Original line number Diff line number Diff line 
#!/usr/bin/env sh

npx playwright install chrome

npx playwright install msedge