Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
2fc9276d
Commit
2fc9276d
authored
Dec 23, 2016
by
Sergio Bertolin
Browse files
Added a new execution on jenkins using alternative homes
parent
bd877f31
Changes
3
Show whitespace changes
Inline
Side-by-side
Jenkinsfile
View file @
2fc9276d
...
...
@@ -126,6 +126,15 @@ timestampedNode('SLAVE') {
make test-integration
'''
}
executeAndReport
(
'build/integration/output/*.xml'
)
{
sh
'''phpenv local 7.0
rm -rf config/config.php
./occ maintenance:install --admin-pass=admin
make clean-test-integration
make test-integration OC_TEST_ALT_HOME=1
'''
}
}
}
...
...
Makefile
View file @
2fc9276d
...
...
@@ -152,7 +152,7 @@ test-js: $(nodejs_deps) $(js_deps) $(core_vendor)
.PHONY
:
test-integration
test-integration
:
$(composer_dev_deps)
$(MAKE)
-C
build/integration
$(MAKE)
-C
build/integration
OC_TEST_ALT_HOME
=
$(OC_TEST_ALT_HOME)
.PHONY
:
test-php-lint
test-php-lint
:
$(composer_dev_deps)
...
...
build/integration/Makefile
View file @
2fc9276d
...
...
@@ -22,5 +22,5 @@ clean-test-results:
clean
:
clean-test-results clean-composer-deps
test
:
install-composer-deps
./run.sh
OC_TEST_ALT_HOME
=
$(OC_TEST_ALT_HOME)
./run.sh
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment