diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 334d51143e..0d3f162ba3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,78 +122,6 @@ jobs: - name: Run Tests run: npm run integration-cht-form - tests-k3d: - needs: build - name: ${{ matrix.cmd }} - runs-on: ubuntu-22.04 - timeout-minutes: 60 - - strategy: - fail-fast: false - matrix: - cmd: ['ci-integration-all-k3d', 'ci-integration-sentinel-k3d'] - - steps: - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ env.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - if: ${{ env.INTERNAL_CONTRIBUTOR }} - - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - aws-access-key-id: ${{ secrets.ECR_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.ECR_SECRET_ACCESS_KEY }} - aws-region: eu-west-2 - if: ${{ env.INTERNAL_CONTRIBUTOR }} - - - name: Login to Amazon ECR - id: login-ecr - if: ${{ env.INTERNAL_CONTRIBUTOR }} - uses: aws-actions/amazon-ecr-login@v2 - with: - mask-password: 'true' - - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} - - uses: actions/checkout@v4 - - - name: Download docker images artifacts - uses: actions/download-artifact@v4 - with: - name: cht-images - path: images/ - if: ${{ !env.INTERNAL_CONTRIBUTOR }} - - name: Load docker images - run: ls -1 *.tar | xargs --no-run-if-empty -L 1 docker load -i - working-directory: images/ - if: ${{ !env.INTERNAL_CONTRIBUTOR }} - - - run: mkdir tests/logs - - run: python -m pip install git+https://github.com/medic/pyxform.git@medic-conf-1.17#egg=pyxform-medic - - run: npm install -g cht-conf - - run: npm ci - - - uses: nolar/setup-k3d-k3s@v1 - - uses: azure/setup-helm@v4.1.0 - - uses: azure/setup-kubectl@v4 - - name: Run tests - run: npm run ${{ matrix.cmd }} - - name: Archive Results - uses: actions/upload-artifact@v4 - with: - name: ${{ matrix.cmd }} - path: | - allure-results - allure-report - tests/logs - tests/results/ - if: ${{ failure() }} - translations: needs: build name: Lint translations @@ -214,7 +142,7 @@ jobs: name: ${{ matrix.cmd }}-${{ matrix.suite || '' }}${{ matrix.chrome-version == '90' && '-minimum-browser' || '' }} runs-on: ubuntu-22.04 timeout-minutes: 60 - + env: CHROME_VERSION: ${{ matrix.chrome-version }} JOB_NAME: ${{ matrix.cmd }}-${{ matrix.suite || '' }}${{ matrix.chrome-version == '90' && '-minimum-browser' || '' }} diff --git a/couchdb/Dockerfile b/couchdb/Dockerfile index 2baa33c424..2afba060d5 100644 --- a/couchdb/Dockerfile +++ b/couchdb/Dockerfile @@ -1,4 +1,4 @@ -FROM couchdb:3.3.3 as base_couchdb_build +FROM couchdb:3.4.2 as base_couchdb_build COPY --chown=couchdb:couchdb 10-docker-default.ini /opt/couchdb/etc/default.d/ COPY --chown=couchdb:couchdb vm.args /opt/couchdb/etc/ diff --git a/tests/integration/api/routing.spec.js b/tests/integration/api/routing.spec.js index dcbbad60fc..4191f74268 100644 --- a/tests/integration/api/routing.spec.js +++ b/tests/integration/api/routing.spec.js @@ -403,7 +403,7 @@ describe('routing', () => { if (idx === 0) { // online user request expect(result.limit).to.equal(1); - expect(result.fields).to.equal('all_fields'); + expect(result.fields).to.deep.equal([]); } else { // offline user requests expect(result.statusCode).to.equal(403);