Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
taste-setup
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TASTE
taste-setup
Commits
ae57ac00
Commit
ae57ac00
authored
Oct 21, 2017
by
Thanassis Tsiodras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Attempt to fix remaining issues with regression suite inside TASTE Docker container
parent
4dafd9a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
28 deletions
+36
-28
Docker-run.sh
Docker-run.sh
+2
-0
Dockerfile
Dockerfile
+28
-28
Update-TASTE.sh
Update-TASTE.sh
+6
-0
No files found.
Docker-run.sh
View file @
ae57ac00
...
...
@@ -26,10 +26,12 @@ XAUTH=/tmp/.docker.xauth
touch
${
XAUTH
}
xauth nlist :0 |
sed
-e
's/^..../ffff/'
| xauth
-f
${
XAUTH
}
nmerge -
HOME
=
/root
export
TASTE_IN_DOCKER
=
1
docker run
\
--privileged
\
-e
DISPLAY
\
-e
HOME
\
-e
TASTE_IN_DOCKER
\
-e
XAUTHORITY
=
${
XAUTH
}
\
-v
${
XSOCK
}
:
${
XSOCK
}
\
-v
${
XAUTH
}
:
${
XAUTH
}
\
...
...
Dockerfile
View file @
ae57ac00
...
...
@@ -26,37 +26,37 @@ RUN bash -c 'cd /root ; git clone https://gitrepos.estec.esa.int/taste/taste-set
# but the execution has to be broken down into steps, so that Docker
# can resume the build from whichever step failed in the last attempt.
RUN
bash
-c
'cd /root/tool-src ; git submodule init ; git submodule update'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/01_sudo.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/03_debian.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/04_pythonlibs.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/05_antlr.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/06_stlink.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/10_dmt.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/15_asn1scc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/20_msc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/30_qemu.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/40_ocarina.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/45_pohi.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/50_opengeode.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/53_pymsc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/54_speedometer.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/55_asn1valueEditor.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/56_msc-editor.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/60_buildsupport.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/01_sudo.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/03_debian.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/04_pythonlibs.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/05_antlr.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/06_stlink.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/10_dmt.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/15_asn1scc.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/20_msc.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/30_qemu.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/40_ocarina.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/45_pohi.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/50_opengeode.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/53_pymsc.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/54_speedometer.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/55_asn1valueEditor.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/56_msc-editor.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/60_buildsupport.sh'
# Those that need postgres can set it up themselves (avoid creating huge Docker image)
# RUN bash -c 'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/65_postgres.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/70_taste-model-checker.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/80_build-scripts.sh'
# RUN bash -c 'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/65_postgres.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/70_taste-model-checker.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/80_build-scripts.sh'
# Those that need RTEMS can set it up themselves (avoid creating huge Docker image)
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/85_rtems.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/90_misc.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/91_env.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/95_components_library.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/85_rtems.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/90_misc.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/91_env.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/95_components_library.sh'
RUN
bash
-c
'cd /bin ; sudo rm sh ; sudo ln -s bash sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/96_ZestSC1.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/97_upython.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/98_bash.sh'
RUN
bash
-c
'cd /root/tool-src ; HOME=/root DISABLE_TASTE_BANNER=1 install/99_paths.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/96_ZestSC1.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/97_upython.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/98_bash.sh'
RUN
bash
-c
'cd /root/tool-src ;
PATH=/root/tool-inst/bin:$PATH
HOME=/root DISABLE_TASTE_BANNER=1 install/99_paths.sh'
RUN
bash
-c
'echo ". ~/.bashrc.taste" >> /root/.bashrc'
# Deal with insane bugs in QT when redirecting X11 from a container
RUN
bash
-c
'echo "export QT_X11_NO_MITSHM=1" >> /root/.bashrc'
...
...
Update-TASTE.sh
View file @
ae57ac00
...
...
@@ -5,6 +5,12 @@ git submodule update || exit 1
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
export
DISABLE_TASTE_BANNER
=
1
for
INSTALL_SCRIPT
in
install
/[0-9]
*
sh
;
do
if
[
!
-z
"
${
TASTE_IN_DOCKER
}
"
]
;
then
if
[
"
${
INSTALL_SCRIPT
}
"
==
"install/65_postgres.sh"
]
;
then
echo
Skipping over postgres installation
in
Docker container.
continue
fi
fi
${
INSTALL_SCRIPT
}
||
{
echo
Failed
in
execution of
"
${
INSTALL_SCRIPT
}
"
;
exit
1
;
}
done
echo
"Please close this terminal and open a new one (to"
...
...
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