Commit 0c16a7ff authored by Matt Wise's avatar Matt Wise
Browse files

Merge branch 'aws-python-int-tests' into 'master'

Aws python int tests

See merge request !68
parents dee058ea 20d6fe35
Pipeline #9214 passed with stage
in 44 seconds
......@@ -16,6 +16,10 @@
OTHER_RELEVANT_DATA_COUNTRIES: $AWS_OTHER_RELEVANT_DATA_COUNTRIES
LEGAL_TAG : $AWS_LEGAL_TAG
TENANT_NAME : $AWS_TENANT_NAME
PRIVATE_TENANT1: $AWS_DEFAULT_DATA_PARTITION_ID_TENANT1
PRIVATE_TENANT2: tenant2
SHARED_TENANT: $AWS_DEFAULT_DATA_PARTITION_ID_TENANT2
VENDOR: aws
STORAGE_URL: $AWS_STORAGE_URL
DOMAIN: $AWS_TESTING_DOMAIN
LEGAL_URL: $AWS_LEGAL_URL
......@@ -63,7 +67,8 @@
INDEXER_HOST: $AWS_INDEXER_HOST
AWS_CLUSTER_NAME: $AWS_CLUSTER_NAME
ENTITLEMENTS_URL: $AWS_ENTITLEMENTS_URL
VIRTUAL_SERVICE_HOST_NAME: $AWS_API_GATEWAY_URL
VIRTUAL_SERVICE_HOST_NAME: $AWS_API_GATEWAY_HOST
HOST: $AWS_API_GATEWAY_URL
.aws:
tags: ['osdu-medium']
......@@ -122,7 +127,7 @@ aws-update-ecs:
variables:
- $AWS == 'true'
aws-test:
aws-test-java:
extends:
- .aws
- .aws_variables
......@@ -134,7 +139,27 @@ aws-test:
- mvn $MAVEN_CLI_OPTS -Dmaven.repo.local=$MAVEN_REPO_PATH test --update-snapshots -Dorg.slf4j.simpleLogger.defaultLogLevel=info
only:
variables:
- $AWS == 'true'
- $AWS == 'true' && ($AWS_INT_TEST_TYPE == 'java' || $AWS_INT_TEST_TYPE == null) #Default if not defined
artifacts:
when: on_failure
paths:
- $INTEGRATION_TEST_DIR
expire_in: 1 week
aws-test-python:
extends:
- .aws
- .aws_variables
stage: integration
needs: ['aws-update-ecs']
script:
- ls -ltr
- cd $INTEGRATION_TEST_DIR
- chmod +x ./run-integration-tests.sh
- ./run-integration-tests.sh
only:
variables:
- $AWS == 'true' && $AWS_INT_TEST_TYPE == 'python'
artifacts:
when: on_failure
paths:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment