Skip to content

Chore: Add license env var to ee tests #26650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 11 commits into from
Aug 23, 2022
Merged

Chore: Add license env var to ee tests #26650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
74ab31d
Add license env var to ee tests
ggazzo Aug 22, 2022
b74dbb8
Merge branch 'develop' into chore/ee-license
ggazzo Aug 22, 2022
3702ece
enable ee tests
ggazzo Aug 22, 2022
926bbcb
Merge branch 'chore/ee-license' of github.com:RocketChat/Rocket.Chat …
ggazzo Aug 22, 2022
b0d01f7
Update homepage.spec.ts
ggazzo Aug 22, 2022
7ef58f8
ENTERPRISE_LICENSE docker compose
ggazzo Aug 22, 2022
bc33a19
Merge branch 'chore/ee-license' of github.com:RocketChat/Rocket.Chat …
ggazzo Aug 22, 2022
dc9ccbc
Update docker-compose-ci.yml
sampaiodiego Aug 22, 2022
1e9a51d
Merge branch 'develop' into chore/ee-license
kodiakhq[bot] Aug 22, 2022
defc578
Merge branch 'develop' into chore/ee-license
kodiakhq[bot] Aug 23, 2022
050aa61
Merge branch 'develop' into chore/ee-license
kodiakhq[bot] Aug 23, 2022
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
11 changes: 6 additions & 5 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ jobs:

- name: Start containers
env:
MONGO_URL: "mongodb://host.docker.internal:27017/rocketchat?replicaSet=rs0&directConnection=true"
MONGO_OPLOG_URL: "mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true"
MONGO_URL: 'mongodb://host.docker.internal:27017/rocketchat?replicaSet=rs0&directConnection=true'
MONGO_OPLOG_URL: 'mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true'
run: |
export LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")

Expand Down Expand Up @@ -440,11 +440,12 @@ jobs:

- name: Start containers
env:
MONGO_URL: "mongodb://host.docker.internal:27017/rocketchat?replicaSet=rs0&directConnection=true"
RC_DOCKERFILE: "${{ github.workspace }}/apps/meteor/.docker/Dockerfile"
RC_DOCKER_TAG: "${{ needs.release-versions.outputs.gh-docker-tag }}.official"
MONGO_URL: 'mongodb://host.docker.internal:27017/rocketchat?replicaSet=rs0&directConnection=true'
RC_DOCKERFILE: '${{ github.workspace }}/apps/meteor/.docker/Dockerfile'
RC_DOCKER_TAG: '${{ needs.release-versions.outputs.gh-docker-tag }}.official'
DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }}
TRANSPORTER: nats://nats:4222
ENTERPRISE_LICENSE: ${{ secrets.ENTERPRISE_LICENSE }}
run: |
export LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")

Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/tests/e2e/homepage.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Page } from '@playwright/test';

import { IS_EE } from './config/constants';
import { expect, test } from './utils/test';

const CardIds = {
Expand Down Expand Up @@ -122,7 +123,7 @@ test.describe.serial('homepage', () => {
});

test.describe('enterprise edition', () => {
test.skip(/* !IS_EE */ true, 'Enterprise Only');
test.skip(!IS_EE, 'Enterprise Only');

test.beforeAll(async ({ api }) => {
expect((await api.post('/settings/Layout_Custom_Body_Only', { value: true })).status()).toBe(200);
Expand Down
35 changes: 18 additions & 17 deletions docker-compose-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ services:
environment:
- TEST_MODE=true
- EXIT_UNHANDLEDPROMISEREJECTION=true
- "MONGO_URL=${MONGO_URL}"
- "MONGO_OPLOG_URL=${MONGO_OPLOG_URL}"
- "TRANSPORTER=${TRANSPORTER}"
- 'MONGO_URL=${MONGO_URL}'
- 'MONGO_OPLOG_URL=${MONGO_OPLOG_URL}'
- 'TRANSPORTER=${TRANSPORTER}'
- MOLECULER_LOG_LEVEL=info
- 'ROCKETCHAT_LICENSE=${ENTERPRISE_LICENSE}'
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
depends_on:
- traefik
labels:
Expand All @@ -30,11 +31,11 @@ services:
SERVICE: authorization
image: ghcr.io/${LOWERCASE_REPOSITORY}/authorization-service:${DOCKER_TAG}
environment:
- "MONGO_URL=${MONGO_URL}"
- TRANSPORTER=nats://nats:4222
- 'MONGO_URL=${MONGO_URL}'
- 'TRANSPORTER=${TRANSPORTER}'
- MOLECULER_LOG_LEVEL=info
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
depends_on:
- nats

Expand All @@ -46,10 +47,10 @@ services:
image: ghcr.io/${LOWERCASE_REPOSITORY}/account-service:${DOCKER_TAG}
environment:
- MONGO_URL=${MONGO_URL}
- TRANSPORTER=nats://nats:4222
- 'TRANSPORTER=${TRANSPORTER}'
- MOLECULER_LOG_LEVEL=info
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
depends_on:
- nats

Expand All @@ -61,10 +62,10 @@ services:
image: ghcr.io/${LOWERCASE_REPOSITORY}/presence-service:${DOCKER_TAG}
environment:
- MONGO_URL=${MONGO_URL}
- TRANSPORTER=nats://nats:4222
- 'TRANSPORTER=${TRANSPORTER}'
- MOLECULER_LOG_LEVEL=info
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
depends_on:
- nats

Expand All @@ -76,10 +77,10 @@ services:
image: ghcr.io/${LOWERCASE_REPOSITORY}/ddp-streamer-service:${DOCKER_TAG}
environment:
- MONGO_URL=${MONGO_URL}
- TRANSPORTER=nats://nats:4222
- 'TRANSPORTER=${TRANSPORTER}'
- MOLECULER_LOG_LEVEL=info
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
depends_on:
- nats
- traefik
Expand All @@ -97,19 +98,19 @@ services:
image: ghcr.io/${LOWERCASE_REPOSITORY}/stream-hub-service:${DOCKER_TAG}
environment:
- MONGO_URL=${MONGO_URL}
- TRANSPORTER=nats://nats:4222
- 'TRANSPORTER=${TRANSPORTER}'
- MOLECULER_LOG_LEVEL=info
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
depends_on:
- nats

nats:
image: nats:2.6-alpine
extra_hosts:
- "host.docker.internal:host-gateway"
- 'host.docker.internal:host-gateway'
ports:
- "4222:4222"
- '4222:4222'

traefik:
image: traefik:v2.8
Expand Down