Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DBRepo
Manage
Activity
Members
Labels
Plan
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FAIR Data Austria DB Repository
DBRepo
Merge requests
!18
Merge Conflicts
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Merge Conflicts
dev
into
master
Overview
2
Commits
290
Pipelines
0
Changes
273
1 open thread
Hide all comments
Merged
Merge Conflicts
Martin Weise
requested to merge
dev
into
master
May 31, 2021
Overview
2
Commits
290
Pipelines
0
Changes
273
1 open thread
Hide all comments
0
0
Merge request reports
Compare
master
version 6
8ce3cba6
May 31, 2021
version 5
cfe6f27f
May 31, 2021
version 4
31ec52d9
May 31, 2021
version 3
d0c525e3
May 31, 2021
version 2
4bf11384
May 31, 2021
version 1
f5c4133d
May 31, 2021
master (base)
and
latest version
latest version
7a3b8042
290 commits,
Jun 1, 2021
version 6
8ce3cba6
289 commits,
May 31, 2021
version 5
cfe6f27f
288 commits,
May 31, 2021
version 4
31ec52d9
287 commits,
May 31, 2021
version 3
d0c525e3
286 commits,
May 31, 2021
version 2
4bf11384
285 commits,
May 31, 2021
version 1
f5c4133d
282 commits,
May 31, 2021
273 files
+
7567
−
17755
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
273
.gitlab/pre-merge-test
0 → 100755
+
40
−
0
View file @ 7a3b8042
Edit in single-file editor
Open in Web IDE
#!/bin/bash
# DESCRIPTION: script to check if the current code base passes all tests before submitting to pipeline
# WHEN: merge to dev, master
SERVICES
=
"container
database
discovery
gateway
query
table"
# 1) Docker
echo
-e
"
\e
[96m1
\e
[39m) Docker"
echo
"Building all"
docker-compose build
>
/dev/null 2>&1
if
[[
$?
-ne
0
]]
;
then
echo
-e
"...
\e
[91mNOT OK
\e
[39m"
else
echo
-e
"...
\e
[92mOK
\e
[39m"
fi
# 2) Maven
echo
-e
"
\e
[96m2
\e
[39m) Maven"
for
service
in
$SERVICES
;
do
echo
"Testing ./fda-
${
service
}
-service"
RESULT
=
$(
mvn
-f
"./fda-
${
service
}
-service/pom.xml"
clean
test
verify |
grep
-o
"FAILURE"
)
if
[[
$RESULT
]]
;
then
echo
-e
"...
\e
[91mNOT OK
\e
[39m"
else
echo
-e
"...
\e
[92mOK
\e
[39m"
fi
done
# 3) Runtime
echo
-e
"
\e
[96m3
\e
[39m) Runtime"
echo
"Execute Docker runtime, look for errors"
docker-compose up
Loading