diff --git a/.travis.yml b/.travis.yml index 7107e787..46c3504b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,6 @@ env: - FEDORA_VERSION="3.5" - FEDORA_VERSION="3.6.2" - FEDORA_VERSION="3.7.0" - global: - # This key is unique to the Islandora/islandora repository; logging will - # fail on forked repositories unless a new unique key is generated for them. - - secure: "nTv2Zb/qKlECK+xE5ahbfXI9ZZbf2ZMd796q7oPlTxUwvu6nomHnUOjJATl6tq2cj23PyJ89Jlgl5cMZ5h0QMUzYpN5hPyY6oCJxWgFamFaE3bv5E/rBd1f6WVTJW7S4UKn8Mr9R2PrX+ZxQZGVIigAfR8VfhQuP8PcuO5eMLBk=" before_install: - export ISLANDORA_DIR=$TRAVIS_BUILD_DIR - $TRAVIS_BUILD_DIR/tests/scripts/travis_setup.sh diff --git a/tests/scripts/travis_after_failure.sh b/tests/scripts/travis_after_failure.sh index f82c8e24..b71ecf6f 100755 --- a/tests/scripts/travis_after_failure.sh +++ b/tests/scripts/travis_after_failure.sh @@ -4,19 +4,21 @@ IFS=/ read -a DELIMITED_SLUG <<< "$TRAVIS_REPO_SLUG" export CURRENT_REPO=${DELIMITED_SLUG[1]} -git config user.name --global islandora-logger -git config user.email --global noreply@islandora.ca +git config --global user.name islandora-logger +git config --global user.email noreply@islandora.ca # Git business -export VERBOSE_DIR = $HOME/sites/default/files/simpletest/verbose -cd $HOME -git clone https://islandora-logger:$LOGGER_PW@github.com/Islandora/islandora_travis_logs.git +cd $HOME/drupal-* +export VERBOSE_DIR=`pwd`/sites/default/files/simpletest/verbose +git clone -b $CURRENT_REPO https://github.com/Islandora/islandora_travis_logs.git cd islandora_travis_logs git checkout -B $CURRENT_REPO # Out with the old, in with the new -git rm $HOME/islandora_travis_logs/*.* -cp $VERBOSE_DIR/*.* $HOME/islandora_travis_logs +rm -rf ./* +cp $VERBOSE_DIR/* ./ +cp $HOME/islandora_tomcat/logs/* ./ +cp /tmp/drush_webserver.log ./ git add -A git commit -m "Job: $TRAVIS_JOB_NUMBER Commit: $TRAVIS_COMMIT" -git push origin $CURRENT_REPO +git push origin $CURRENT_REPO --quiet diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 4e0d70d7..0b33d4b0 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -32,7 +32,7 @@ drush si minimal --db-url=mysql://drupal:drupal@localhost/drupal --yes sudo chmod a+w sites/default/settings.php echo "include_once '$HOME/.composer/vendor/autoload.php';" >> sites/default/settings.php sudo chmod a-w sites/default/settings.php -drush runserver --php-cgi=$HOME/.phpenv/shims/php-cgi localhost:8081 &>/dev/null & +drush runserver --php-cgi=$HOME/.phpenv/shims/php-cgi localhost:8081 &>/tmp/drush_webserver.log & ln -s $ISLANDORA_DIR sites/all/modules/islandora mv sites/all/modules/islandora/tests/travis.test_config.ini sites/all/modules/islandora/tests/test_config.ini mkdir sites/all/libraries