diff options
| -rw-r--r-- | Jenkinsfile | 165 | ||||
| -rw-r--r-- | apps/federatedfilesharing/lib/DiscoveryManager.php | 6 | ||||
| -rw-r--r-- | apps/federatedfilesharing/tests/DiscoveryManagerTest.php | 1 | ||||
| -rw-r--r-- | tests/lib/SystemTag/SystemTagObjectMapperTest.php | 2 |
4 files changed, 125 insertions, 49 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 9e6ac097a82..8c15c67f25f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,68 +1,137 @@ #!groovy +/* + * This Jenkinsfile is intended to run on https://ci.owncloud.org and may fail anywhere else. + * It makes assumptions about plugins being installed, labels mapping to nodes that can build what is needed, etc. + */ -node('SLAVE') { +timestampedNode('SLAVE') { stage 'Checkout' checkout scm sh '''git submodule update --init''' stage 'JavaScript Testing' - sh '''./autotest-js.sh''' - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-js.xml']) + executeAndReport('tests/autotest-results-js.xml') { + sh '''./autotest-js.sh''' + } stage 'PHPUnit' - sh ''' - export NOCOVERAGE=1 - unset USEDOCKER - phpenv local 7.0 - ./autotest.sh sqlite - phpenv local 5.4 - ./autotest.sh mysql - phpenv local 5.6 - ./autotest.sh pgsql - phpenv local 5.5 - ./autotest.sh oci - ''' - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-sqlite.xml']) - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-mysql.xml']) - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-oci.xml']) - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-pgsql.xml']) + executeAndReport('tests/autotest-results-sqlite.xml') { + sh ''' + export NOCOVERAGE=1 + unset USEDOCKER + phpenv local 7.0 + ./autotest.sh sqlite + ''' + } + executeAndReport('tests/autotest-results-mysql.xml') { + sh ''' + export NOCOVERAGE=1 + unset USEDOCKER + phpenv local 5.4 + ./autotest.sh mysql + ''' + } + executeAndReport('tests/autotest-results-pgsql.xml') { + sh ''' + export NOCOVERAGE=1 + unset USEDOCKER + phpenv local 5.6 + ./autotest.sh pgsql + ''' + } + executeAndReport('tests/autotest-results-oci.xml') { + sh ''' + export NOCOVERAGE=1 + unset USEDOCKER + phpenv local 5.5 + ./autotest.sh oci + ''' + } stage 'Files External Testing' - sh '''phpenv local 7.0 - export NOCOVERAGE=1 - unset USEDOCKER - ./autotest-external.sh sqlite webdav-ownCloud - ./autotest-external.sh sqlite smb-silvershell - ./autotest-external.sh sqlite swift-ceph - ''' + executeAndReport('tests/autotest-external-results-sqlite-webdav-ownCloud.xml') { + sh '''phpenv local 7.0 + export NOCOVERAGE=1 + unset USEDOCKER + ./autotest-external.sh sqlite webdav-ownCloud + ''' + } + executeAndReport('tests/autotest-external-results-sqlite-smb-silvershell.xml') { + sh '''phpenv local 7.0 + export NOCOVERAGE=1 + unset USEDOCKER + ./autotest-external.sh sqlite smb-silvershell + ''' + } + executeAndReport('tests/autotest-external-results-sqlite-swift-ceph.xml') { + sh '''phpenv local 7.0 + export NOCOVERAGE=1 + unset USEDOCKER + ./autotest-external.sh sqlite swift-ceph + ''' + } + executeAndReport('tests/autotest-external-results-sqlite-smb-windows.xml') { + sh '''phpenv local 7.0 + export NOCOVERAGE=1 + unset USEDOCKER + ./autotest-external.sh sqlite smb-windows + ''' + } + step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite.xml']) - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-webdav-ownCloud.xml']) - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-smb-silvershell.xml']) - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-external-results-sqlite-swift-ceph.xml']) stage 'Primary Objectstore Test - Swift' - sh '''phpenv local 7.0 + executeAndReport('tests/autotest-results-mysql.xml') { + sh '''phpenv local 7.0 - export NOCOVERAGE=1 - export RUN_OBJECTSTORE_TESTS=1 - export PRIMARY_STORAGE_CONFIG="swift" - unset USEDOCKER + export NOCOVERAGE=1 + export RUN_OBJECTSTORE_TESTS=1 + export PRIMARY_STORAGE_CONFIG="swift" + unset USEDOCKER - rm tests/autotest-results-*.xml - ./autotest.sh mysql - ''' - step([$class: 'JUnitResultArchiver', testResults: 'tests/autotest-results-mysql.xml']) + rm tests/autotest-results-*.xml + ./autotest.sh mysql + ''' + } stage 'Integration Testing' - sh '''phpenv local 7.0 - rm -rf config/config.php - ./occ maintenance:install --admin-pass=admin - rm -rf build/integration/output - rm -rf build/integration/vendor - rm -rf build/integration/composer.lock - cd build/integration - ./run.sh - ''' - step([$class: 'JUnitResultArchiver', testResults: 'build/integration/output/*.xml']) + executeAndReport('build/integration/output/*.xml') { + sh '''phpenv local 7.0 + rm -rf config/config.php + ./occ maintenance:install --admin-pass=admin + rm -rf build/integration/output + rm -rf build/integration/vendor + rm -rf build/integration/composer.lock + cd build/integration + ./run.sh + ''' + } } +void executeAndReport(String testResultLocation, def body) { + def failed = false + // We're wrapping this in a timeout - if it takes longer, kill it. + try { + timeout(time: 120, unit: 'MINUTES') { + body.call() + } + } catch (Exception e) { + failed = true + echo "Test execution failed: ${e}" + } finally { + step([$class: 'JUnitResultArchiver', testResults: testResultLocation]) + } + + if (failed) { + error "Test execution failed. Terminating the build" + } +} + +// Runs the given body within a Timestamper wrapper on the given label. +def timestampedNode(String label, Closure body) { + node(label) { + wrap([$class: 'TimestamperBuildWrapper']) { + body.call() + } + } +} diff --git a/apps/federatedfilesharing/lib/DiscoveryManager.php b/apps/federatedfilesharing/lib/DiscoveryManager.php index 25af0a40fd5..13af9ba78aa 100644 --- a/apps/federatedfilesharing/lib/DiscoveryManager.php +++ b/apps/federatedfilesharing/lib/DiscoveryManager.php @@ -39,6 +39,8 @@ class DiscoveryManager { private $cache; /** @var IClient */ private $client; + /** @var bool */ + public $underTest = false; /** * @param ICacheFactory $cacheFactory @@ -82,6 +84,10 @@ class DiscoveryManager { 'share' => '/ocs/v1.php/cloud/shares', ]; + if (defined('PHPUNIT_RUN') && !$this->underTest) { + return $discoveredServices; + } + // Read the data from the response body try { $response = $this->client->get($remote . '/ocs-provider/', [ diff --git a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php index a9c324f0244..28c129bc9ae 100644 --- a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php +++ b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php @@ -62,6 +62,7 @@ class DiscoveryManagerTest extends \Test\TestCase { $cacheFactory, $clientService ); + $this->discoveryManager->underTest = true; } public function testWithMalformedFormattedEndpointCached() { diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php index 69cf7e8f816..56f8de32f7d 100644 --- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php +++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php @@ -151,7 +151,7 @@ class SystemTagObjectMapperTest extends TestCase { $this->assertEquals([ '1', '2', - ], $objectIds); + ], $objectIds, '', 0.0, 10, true); } public function testGetObjectsForTagsLimit() { |