Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
9036d2d6
Commit
9036d2d6
authored
9 years ago
by
Mark Haines
Browse files
Options
Downloads
Patches
Plain Diff
Use an absolute path when specifying the directory for synapse in jenkins.sh
parent
64b66068
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jenkins.sh
+8
-8
8 additions, 8 deletions
jenkins.sh
with
8 additions
and
8 deletions
jenkins.sh
+
8
−
8
View file @
9036d2d6
...
...
@@ -22,9 +22,7 @@ tox
:
${
GIT_BRANCH
:
=
"origin/
$(
git rev-parse
--abbrev-ref
HEAD
)
"
}
set
+u
.
.tox/py27/bin/activate
set
-u
TOX_BIN
=
$WORKSPACE
/.tox/py27/bin
if
[[
!
-e
.sytest-base
]]
;
then
git clone https://github.com/matrix-org/sytest.git .sytest-base
--mirror
...
...
@@ -48,7 +46,8 @@ export PERL5LIB PERL_MB_OPT PERL_MM_OPT
:
${
PORT_BASE
:
=8000
}
echo
>
&2
"Running sytest with SQLite3"
;
./run-tests.pl
--coverage
-O
tap
--synapse-directory
..
--all
--port-base
$PORT_BASE
>
results-sqlite3.tap
./run-tests.pl
--coverage
-O
tap
--synapse-directory
$WORKSPACE
\
--python
$TOX_BIN
/python
--all
--port-base
$PORT_BASE
>
results-sqlite3.tap
RUN_POSTGRES
=
""
...
...
@@ -66,8 +65,9 @@ done
# Run if both postgresql databases exist
if
test
$RUN_POSTGRES
=
":
$((
$PORT_BASE
+
1
))
:
$((
$PORT_BASE
+
2
))
"
;
then
echo
>
&2
"Running sytest with PostgreSQL"
;
pip
install
psycopg2
./run-tests.pl
--coverage
-O
tap
--synapse-directory
..
--all
--port-base
$PORT_BASE
>
results-postgresql.tap
$TOX_BIN
/pip
install
psycopg2
./run-tests.pl
--coverage
-O
tap
--synapse-directory
$WORKSPACE
\
--python
$TOX_BIN
/python
--all
--port-base
$PORT_BASE
>
results-postgresql.tap
else
echo
>
&2
"Skipping running sytest with PostgreSQL,
$RUN_POSTGRES
"
fi
...
...
@@ -76,6 +76,6 @@ cd ..
cp
sytest/.coverage.
*
.
# Combine the coverage reports
python
-m
coverage combine
$TOX_BIN
/
python
-m
coverage combine
# Output coverage to coverage.xml
coverage xml
-o
coverage.xml
$TOX_BIN
/
coverage xml
-o
coverage.xml
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment