diff --git a/.travis.yml b/.travis.yml index 9666e98b88..7429449d09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,19 +61,19 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Enterprise WORM automated Tests" + - name: "Enterprise WORM Tests" stage: Tests before_install: bash scripts/init.sh script: bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh - - echo "Enterprise WORM automated Tests" + - echo "Enterprise WORM Tests" - # - name: "Community Integrations Tests on MySQL" - # stage: Tests - # script: - # - echo "Community Integrations Tests on MySQL" - # - name: "Enterprise Integrations Tests on MySQL" + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" # stage: Tests # script: # - echo "Enterprise Integrations Tests on MySQL" diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 3ca38a97f6..43a3fa29d7 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -8,12 +8,9 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} -export BUCKET_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" -export BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" - export S3_BUCKET_REGION="eu-west-1" -export S3_BUCKET_NAME="${BUCKET_NAME}" -export S3_BUCKET2_NAME="${BUCKET2_NAME}" +export S3_BUCKET_NAME="travis-ags-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" +export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest @@ -22,13 +19,9 @@ mvn -B -U clean install -DskipTests -Pbuild-test-image ./scripts/start-compose.sh ./rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml # Run the WORM tests -# mvn -B -U clean test \ -# -Prun-tas-tests,run-multiple-buckets-tests \ -# -Denvironment=default \ -# -DrunBugs=false \ -# -Dalfresco.port=8080 \ -# -Dconnector.s3.bucketName=${BUCKET_NAME2} - +mvn -B -U clean test \ + -DsuiteXmlFile=wormTestSuite.xml + -Dconnector.s3.bucketName=${S3_BUCKET2_NAME} popd set +vex