Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

Commit

Permalink
Add accept EULA parameters (#239)
Browse files Browse the repository at this point in the history
* Add accept EULA parameters

* Add info about EULA in readme
  • Loading branch information
peol committed Feb 9, 2018
1 parent 0159b99 commit a93aa41
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 6 deletions.
13 changes: 10 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
command: |
# Spin up a local setup with the previously built docker image.
VER=$(cat workspace/version.txt)
TAG=:${VER} MIRA_ENGINE_DISCOVERY_INTERVAL=1000 docker-compose up -d
TAG=:${VER} MIRA_ENGINE_DISCOVERY_INTERVAL=1000 ACCEPT_EULA=yes docker-compose up -d
- run:
name: Check that services are up and running
command: |
Expand Down Expand Up @@ -137,7 +137,9 @@ jobs:
docker swarm init
# Spin up a local setup with the previously built docker image.
VER=$(cat /tmp/workspace/version.txt)
TAG=:${VER} docker stack deploy -c ./examples/swarm/docker-compose-swarm.yml --with-registry-auth mira-swarm
TAG=:${VER}
ACCEPT_EULA=yes
docker stack deploy -c ./examples/swarm/docker-compose-swarm.yml --with-registry-auth mira-swarm
- run:
name: Check health of the Mira service
command: |
Expand Down Expand Up @@ -206,6 +208,9 @@ jobs:
- run:
name: Add docker credentials as kubernetes secret
command: sudo kubectl create secret docker-registry dockerhub --docker-username=$DOCKER_USER --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
- run:
name: Accept EULA
command: grep -rl AcceptEULA ./examples/kubernetes/ | xargs sed -i 's/AcceptEULA=no/AcceptEULA=yes/g'
- run:
name: Kubernetes plain mira
command: |
Expand Down Expand Up @@ -261,7 +266,9 @@ jobs:
docker swarm init
# Spin up a local setup with the previously built docker image.
VER=$(cat /tmp/workspace/version.txt)
TAG=:${VER} docker stack deploy -c ./examples/dns/docker-compose-dns.yml --with-registry-auth mira-dns
TAG=:${VER}
ACCEPT_EULA=yes
docker stack deploy -c ./examples/dns/docker-compose-dns.yml --with-registry-auth mira-dns
- run:
name: Check health of the Mira service
command: |
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,17 @@ $ npm run test:component

These tests run Mira in isolation and does not depend on any external components.

Integration tests depend on external components. Before they can run, they must be started using the [docker-compose.yml](./docker-compose.yml) file:
Integration tests depend on external components. Before they can run, you must accept the [Qlik Core EULA](https://ca.qliktive.com/docs/master/beta/) by setting the `ACCEPT_EULA` environment variable, you start the services by using the [docker-compose.yml](./docker-compose.yml) file:

```sh
$ docker-compose up -d
$ ACCEPT_EULA=yes docker-compose up -d
$ npm run test:integration
```

To run integration tests towards a specific image tag, provide the `TAG` environment variable to `docker-compose`:

```bash
$ TAG=:<YOUR TAG HERE> docker-compose up -d
$ ACCEPT_EULA=yes TAG=:<YOUR TAG HERE> docker-compose up -d
$ npm run test:integration
```

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ services:

engine1:
image: qlikea/engine:12.134.0
command: -S AcceptEULA=${ACCEPT_EULA}
ports:
- "9176:9076"
labels:
qix-engine:

engine2:
image: qlikea/engine:12.134.0
command: -S AcceptEULA=${ACCEPT_EULA}
ports:
- "9276:9076"
labels:
Expand Down
1 change: 1 addition & 0 deletions examples/dns/docker-compose-dns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:

qix-engine:
image: qlikea/engine:12.134.0
command: -S AcceptEULA:${ACCEPT_EULA}
ports:
- 9076:9076
deploy:
Expand Down
1 change: 1 addition & 0 deletions examples/kubernetes/engine-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
- name: engine
image: "qlikea/engine:12.134.0"
imagePullPolicy: IfNotPresent
args: ["-S", "AcceptEULA=no"]
ports:
- containerPort: 9076
- containerPort: 9090
Expand Down

0 comments on commit a93aa41

Please sign in to comment.