Skip to content
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.

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

Use profile for importer in e2e setup script #33

Merged
merged 2 commits into from
Sep 19, 2024
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
7 changes: 6 additions & 1 deletion github-actions/run-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ inputs:
docker-compose.custom.yml setup
required: false
default: ""
start_jore3_importer:
description: Should Jore3 importer be started along the rest of the e2e environment.
required: false
default: "false"
test-tags:
description:
Specify a string of tags for tests to be run in format '@smoke'. To
Expand All @@ -116,7 +120,7 @@ runs:
uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1

- name: Start e2e env
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v6
uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v7
with:
ui_version: "${{ inputs.ui_version }}"
cypress_version: "${{ inputs.cypress_version }}"
Expand All @@ -134,6 +138,7 @@ runs:
timetablesapi_version: "${{ inputs.timetablesapi_version }}"
tiamat_version: "${{ inputs.tiamat_version }}"
custom_docker_compose: "${{ inputs.custom_docker_compose }}"
start_jore3_importer: "${{ inputs.start_jore3_importer }}"

- name: Seed infrastructure links
uses: HSLdevcom/jore4-tools/github-actions/seed-infrastructure-links@seed-infrastructure-links-v2
Expand Down
8 changes: 7 additions & 1 deletion github-actions/setup-e2e-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ inputs:
docker-compose.custom.yml setup
required: false
default: ""
start_jore3_importer:
description: Should Jore3 importer be started along the rest of the e2e environment.
required: false
default: "false"

runs:
using: "composite"
Expand Down Expand Up @@ -124,7 +128,7 @@ runs:
TIMETABLESAPI_DOCKER_IMAGE: ${{ inputs.timetablesapi_version }}
TIAMAT_DOCKER_IMAGE: ${{ inputs.tiamat_version }}
run: |
docker compose -f ${{ github.workspace }}/docker/docker-compose.yml ${{ inputs.custom_docker_compose != '' && format('-f {0}', inputs.custom_docker_compose) || '' }} up -d
docker compose -f ${{ github.workspace }}/docker/docker-compose.yml ${{ inputs.custom_docker_compose != '' && format('-f {0}', inputs.custom_docker_compose) || '' }} ${{ inputs.start_jore3_importer == 'true' && '--profile importer' || '' }} up -d
shell: bash

- name: Show which versions of the docker images are spun up
Expand All @@ -149,6 +153,7 @@ runs:
retries: 50

- name: Verify that mssql testdb is up and running
if: ${{ inputs.start_jore3_importer == 'true' }}
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
env:
SA_PASSWORD: "P@ssw0rd"
Expand Down Expand Up @@ -212,6 +217,7 @@ runs:
/dev/null --silent"

- name: Verify that jore3 importer is up and running standalone
if: ${{ inputs.start_jore3_importer == 'true' }}
uses: HSLdevcom/jore4-tools/github-actions/healthcheck@healthcheck-v1
with:
command:
Expand Down
Loading