Commit 85de0131 authored by Matt Wise's avatar Matt Wise
Browse files

Merge branch 'aws-schema-service' into 'master'

AWS Support Disabling/Overriding Int-test command

See merge request osdu/platform/ci-cd-pipelines!69
parents 0c16a7ff 10df6190
Pipeline #9259 passed with stage
in 7 seconds
......@@ -136,10 +136,10 @@ aws-test-java:
script:
- ls -ltr
- cd $INTEGRATION_TEST_DIR
- mvn $MAVEN_CLI_OPTS -Dmaven.repo.local=$MAVEN_REPO_PATH test --update-snapshots -Dorg.slf4j.simpleLogger.defaultLogLevel=info
- mvn $MAVEN_CLI_OPTS -Dmaven.repo.local=$MAVEN_REPO_PATH ${AWS_MAVEN_TEST_COMMAND_OVERRIDE:-test} --update-snapshots -Dorg.slf4j.simpleLogger.defaultLogLevel=info
only:
variables:
- $AWS == 'true' && ($AWS_INT_TEST_TYPE == 'java' || $AWS_INT_TEST_TYPE == null) #Default if not defined
- $AWS_SKIP_TESTS != 'true' && $AWS == 'true' && ($AWS_INT_TEST_TYPE == 'java' || $AWS_INT_TEST_TYPE == null) #Default if not defined
artifacts:
when: on_failure
paths:
......@@ -159,7 +159,7 @@ aws-test-python:
- ./run-integration-tests.sh
only:
variables:
- $AWS == 'true' && $AWS_INT_TEST_TYPE == 'python'
- $AWS_SKIP_TESTS != 'true' && $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