diff --git a/.github/workflows/e2e-dev.yml b/.github/workflows/e2e-dev.yml deleted file mode 100644 index 07f4623057..0000000000 --- a/.github/workflows/e2e-dev.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: 'e2e-dev' - -on: - workflow_call: - secrets: - baseurl: - required: true - username: - required: true - password: - required: true - recordkey: - required: true - -concurrency: - group: e2e-dev-${{ github.workflow}}-${{ github.ref }} - cancel-in-progress: true - -defaults: - run: - shell: bash - -jobs: - compute-dev-version: - if: "!github.event.push.repository.fork && (github.event.pull_request.draft == false || github.action == 'workflow_dispatch')" - runs-on: ubuntu-latest - outputs: - version: ${{ steps.instance-version.outputs.version }} - steps: - - name: Output dev version - id: instance-version - uses: dhis2/action-instance-version@v1 - with: - instance-url: ${{ secrets.baseurl }} - username: ${{ secrets.username }} - password: ${{ secrets.password }} - - e2e-dev: - needs: compute-dev-version - runs-on: ubuntu-latest - container: - image: cypress/browsers:node16.17.0-chrome106 - options: --user 1001 - - strategy: - fail-fast: false - matrix: - containers: [1, 2, 3, 4] - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - uses: actions/setup-node@v3 - with: - node-version: 18.x - - - name: Run e2e tests - uses: cypress-io/github-action@v5 - with: - start: yarn d2-app-scripts start - wait-on: 'http://localhost:3000' - wait-on-timeout: 300 - record: true - parallel: true - browser: chrome - group: e2e-chrome-parallel-dev - env: - BROWSER: none - CYPRESS_RECORD_KEY: ${{ secrets.recordkey }} - CYPRESS_dhis2BaseUrl: ${{ secrets.baseurl }} - CYPRESS_dhis2InstanceVersion: ${{ needs.compute-dev-version.outputs.version }} - CYPRESS_dhis2Username: ${{ secrets.username }} - CYPRESS_dhis2Password: ${{ secrets.password }} - CYPRESS_networkMode: live - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f8e8303ee8..0f22fbe25a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,9 +18,8 @@ defaults: jobs: call-workflow-e2e-dev: if: github.ref == 'refs/heads/dev' - uses: ./.github/workflows/e2e-dev.yml + uses: dhis2/workflows/.github/workflows/analytics-e2e-tests-prod.yml@chore/analytics-workflow-changes secrets: - baseurl: ${{ secrets.CYPRESS_DHIS2_BASE_URL_DEV }} username: ${{ secrets.CYPRESS_DHIS2_USERNAME }} password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }} recordkey: ${{ secrets.CYPRESS_RECORD_KEY }}