Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NFV - Network Functions Virtualisation
api-tests
Commits
6a5865a0
Commit
6a5865a0
authored
Jun 22, 2021
by
Giacomo Bernini
Browse files
Merge branch 'testing-dev' into '3.3.1-dev'
Enhacement of Jenkins build scripts See merge request
!195
parents
f06df0c7
88c9c1c6
Changes
4
Hide whitespace changes
Inline
Side-by-side
.jenkins.sh
View file @
6a5865a0
...
...
@@ -9,8 +9,10 @@ cd "$(dirname "$0")"
run_dir
=
"
$(
pwd
)
"
echo
"Using git branch
$GIT_BRANCH
"
bash ./scripts/build-container.sh
bash ./scripts/run-container.sh
"
${
run_dir
}
"
bash ./scripts/run-container.sh
"
${
run_dir
}
"
"
$GIT_BRANCH
"
ret
=
$?
echo
"Final validation result:
$ret
"
...
...
scripts/docker/Dockerfile
View file @
6a5865a0
...
...
@@ -35,6 +35,8 @@ ADD extensions /home/etsi/dev/robot/extensions
RUN
ls
/home/etsi/dev/robot
#To avoid to use the cache when new commits are available
ADD
"https://forge.etsi.org/rep/api/v4/projects/224/repository/branches/master" /tmp/devalidateCache
RUN
DEBIAN_FRONTED
=
noninteractive
\
cd
/home/etsi/dev/
\
...
...
scripts/run-container.sh
View file @
6a5865a0
...
...
@@ -7,8 +7,10 @@
mkdir
-p
build
echo
"Using git branch
$2
"
docker run
-v
"
$(
pwd
)
/build:/home/etsi/dev/build"
stf583-rf-validation:latest
"bash"
\
-c
"/home/etsi/dev/robot/scripts/validate.sh"
-c
"/home/etsi/dev/robot/scripts/validate.sh
$2
"
ret
=
$?
...
...
scripts/validate.sh
View file @
6a5865a0
...
...
@@ -17,11 +17,19 @@ for i in */*/*.robot ; do
fi
done
cd
/home/etsi/dev/robot2doc/robot2doc
echo
"Using git branch
$1
"
mkdir
-p
/home/etsi/dev/build
cd
/home/etsi/dev/build
rm
-r
-v
*
python3 create_sols.py ../../robot
'local'
../../build
res2
=
$?
if
[[
"
$1
"
=
~ .
*
-dev
$
||
"
$1
"
=
~
\d
+
(
\.
?
\d
)
+
||
"
$1
"
==
"master"
]]
;
then
cd
/home/etsi/dev/robot2doc/robot2doc
python3 create_sols.py ../../robot
'local'
../../build
res2
=
$?
else
res2
=
0
fi
exit
$res
&&
$res2
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment