Permalink
Browse files

Reactivating docker based integration tests and result uploads

  • Loading branch information...
atooni committed Dec 7, 2018
1 parent 7d1fc5a commit 915c8562442c97134f7645ceaedc26605ec0230a
@@ -80,9 +80,8 @@ stages:
- name: BuildPlugin
if: branch = master AND type = push

# Skip this, as it fails always; some not well understood travis issue
# - name: IntegrationTest
# if: branch = master AND type = push
- name: IntegrationTest
if: branch = master AND type = push

jobs:
include:
@@ -128,13 +127,13 @@ jobs:
- bash $TRAVIS_BUILD_DIR/scripts/updaterMavenPlugin.sh

# ------ Stage Docker Images
# - stage: IntegrationTest
# script:
# - bash $TRAVIS_BUILD_DIR/scripts/itest.sh
# after_failure:
# - $TRAVIS_BUILD_DIR/scripts/upload-directory.sh $TRAVIS_BUILD_DIR/container/itest itest
# after_success:
# - $TRAVIS_BUILD_DIR/scripts/upload-directory.sh $TRAVIS_BUILD_DIR/container/itest itest
- stage: IntegrationTest
script:
- bash $TRAVIS_BUILD_DIR/scripts/itest.sh
after_failure:
- $TRAVIS_BUILD_DIR/scripts/upload-directory.sh $TRAVIS_BUILD_DIR/container/itest itest
after_success:
- $TRAVIS_BUILD_DIR/scripts/upload-directory.sh $TRAVIS_BUILD_DIR/container/itest itest

# ------ Stage Site Deploy
- stage: Site
@@ -188,11 +188,10 @@ final class JmsAckSourceStage(

try {
log.debug(s"Closing session [${session.sessionId}]")
session.closeSessionAsync().onComplete { _ =>
removeConsumer(session.sessionId)
jmsSessions -= session.sessionId
onSessionClosed()
}
session.closeSession()
removeConsumer(session.sessionId)
jmsSessions -= session.sessionId
onSessionClosed()
} catch {
case _ : Throwable =>
log.error(s"Error closing session with id [${session.sessionId}]")
@@ -9,3 +9,5 @@ cd $UPLOAD_DIR
tar -czf ../$UPLOAD_FILE.tgz .

$TRAVIS_BUILD_DIR/scripts/dropbox_uploader.sh upload ../$UPLOAD_FILE.tgz travis/$TRAVIS_BUILD_NUMBER/$UPLOAD_FILE.tgz

$TRAVIS_BUILD_DIR

0 comments on commit 915c856

Please sign in to comment.