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
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -655,24 +655,26 @@ jobs:
# List loaded images
docker images

- name: Run federation integration tests with pre-built image
- name: Start federation services
working-directory: ./ee/packages/federation-matrix
env:
ROCKETCHAT_IMAGE: ghcr.io/${{ needs.release-versions.outputs.lowercase-repo }}/rocket.chat:${{ needs.release-versions.outputs.gh-docker-tag }}-amd64
ENTERPRISE_LICENSE_RC1: ZAikY+LLaal7mT6RNYxpyWEmMQyucrl50/7pYBXqHczc90j+RLwF+T0xuCT2pIpKMC5DxcZ1TtkV6MYJk5whrwmap+mQ0FV+VpILJlL0i4T21K4vMfzZXTWm/pzcAy2fMTUNH+mUA9HTBD6lYYh40KnbGXPAd80VbZk0MO/WbWBm2dOT0YCwfvlRyurRqkDAQrftLaffzCNUsMKk0fh+MKs73UDHZQDp1yvs7WoGpPu5ZVi5mTBOt3ZKVz5KjGfClLwJptFPmW1w6nKelAiJBDPpjcX1ylfjxpnBoixko7uN52zlyaeoAYwfRcdDLnZ8k0Ou6tui/vTQUXjGIjHw2AhMaKwonn4E9LYpuA1KEXt08qJL5J3ZtjSCV1T+A9Z3zFhhLgp5dxP/PPUbxDn/P8XKp7nXM9duIfcCMlnea7V8ixEyCHwwvKQaXVVidcsUGtB8CwS0GlsAEBLOzqMehuQUK2rdQ4WgEz3AYveikeVvSzgBHvyXsxssWAThc0Mht0eEJqdDhUB2QeZ2WmPsaSSD639Z4WgjSUoR0zh8bfqepH+2XRcUryXe2yN+iU+3POzi9wfg0k65MxXT8pBg3PD5RHnR8oflEP0tpZts33JiBhYRxX3MKplAFm4dMuphTsDJTh+e534pT7IPuZF79QSVaLEWZfVVVb7nGFtmMwA=
QASE_TESTOPS_JEST_API_TOKEN: ${{ secrets.QASE_TESTOPS_JEST_API_TOKEN }}
PR_NUMBER: ${{ github.event.number }}
run: yarn test:integration --image "${ROCKETCHAT_IMAGE}"
run: yarn test:integration --start-containers-only --image "${ROCKETCHAT_IMAGE}"

- name: Show rc server logs if tests failed
if: failure()
- name: Run federation integration tests
working-directory: ./ee/packages/federation-matrix
run: docker compose -f docker-compose.test.yml logs rc1-prebuilt
env:
QASE_TESTOPS_JEST_API_TOKEN: ${{ secrets.QASE_TESTOPS_JEST_API_TOKEN }}
PR_NUMBER: ${{ github.event.number }}
run: yarn test:integration --ci

- name: Show hs server logs if tests failed
- name: Show federation integration tests logs
if: failure()
working-directory: ./ee/packages/federation-matrix
run: docker compose -f docker-compose.test.yml logs hs1
run: yarn test:integration --logs

- name: Show mongo logs if tests failed
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"@rocket.chat/emitter": "~0.31.25",
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/federation-matrix": "workspace:^",
"@rocket.chat/federation-sdk": "0.3.8",
"@rocket.chat/federation-sdk": "0.3.9",
"@rocket.chat/fuselage": "^0.70.0",
"@rocket.chat/fuselage-forms": "~0.1.1",
"@rocket.chat/fuselage-hooks": "~0.38.1",
Expand Down
1 change: 0 additions & 1 deletion ee/packages/federation-matrix/jest.config.federation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ export default {
complete: true,
},
},
debug: true,
},
] as [string, { [x: string]: unknown }],
]
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/federation-matrix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "^0.31.25",
"@rocket.chat/federation-sdk": "0.3.8",
"@rocket.chat/federation-sdk": "0.3.9",
"@rocket.chat/http-router": "workspace:^",
"@rocket.chat/license": "workspace:^",
"@rocket.chat/models": "workspace:^",
Expand Down
6 changes: 6 additions & 0 deletions ee/packages/federation-matrix/tests/helper/synapse-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ import * as fs from 'fs';
import * as path from 'path';

import { createClient, type MatrixClient, KnownMembership, type Room, type RoomMember, Visibility } from 'matrix-js-sdk';
import { logger } from 'matrix-js-sdk/lib/logger';

logger.debug = () => void 0;
logger.info = () => void 0;
logger.warn = () => void 0;
logger.error = () => void 0;

/**
* Creates a promise that resolves after the specified delay.
Expand Down
Loading
Loading