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
FlockLab 1 - deprecated
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
TEC
P
Public
FlockLab
FlockLab 1 - deprecated
Commits
0825cbba
Commit
0825cbba
authored
May 03, 2019
by
Reto Da Forno
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner config updated
parent
26f97a36
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
.gitlab-ci.yml
.gitlab-ci.yml
+6
-5
server/testmanagementserver/linktests/linktest_dpp.xml
server/testmanagementserver/linktests/linktest_dpp.xml
+1
-1
server/testmanagementserver/linktests/linktest_tmote.xml
server/testmanagementserver/linktests/linktest_tmote.xml
+1
-1
No files found.
.gitlab-ci.yml
View file @
0825cbba
...
...
@@ -17,18 +17,19 @@ deploy to devserver:
DEV_SERVER
:
'
flocklab@flocklab-dev-server.ethz.ch'
DEV_SERVER2
:
'
flocklab@flocklab-dev-server2.ethz.ch'
SSH_OPTIONS
:
'
ssh
-q
-o
StrictHostKeyChecking=no'
RSYNC_OPTIONS
:
'
-av
--no-perms
--no-owner
--no-group
--delete
--exclude=*.ini
--exclude=*.conf'
# --omit-dir-times
RSYNC_OPTIONS
:
'
-av
--no-perms
--no-owner
--no-group
--delete
--exclude=*.ini
--exclude=*.pyc
--exclude=*.so'
script
:
-
'
apk
update
>/dev/null
&&
apk
add
rsync
openssh-client
>/dev/null'
-
'
eval
$(ssh-agent
-s)
&&
echo
"$CI_SSH_PRIVATE_KEY"
|
ssh-add
-'
-
'
echo
"uploading
files
to
${DEV_SERVER}..."'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/testmanagementserver/
${DEV_SERVER}:testmanagementserver/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/user/
${DEV_SERVER}:webserver/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/testmanagement/
${DEV_SERVER}:testmanagement/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/user/
${DEV_SERVER}:webserver/'
-
'
echo
"uploading
files
to
${DEV_SERVER2}..."'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/testmanagementserver/
${DEV_SERVER2}:testmanagementserver/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/user/
${DEV_SERVER2}:webserver/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/testmanagement/
${DEV_SERVER2}:testmanagement/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/user/
${DEV_SERVER2}:webserver/'
only
:
refs
:
-
python3
...
...
@@ -43,14 +44,14 @@ deploy to production:
variables
:
PRODUCTION_SERVER
:
'
flocklab@whymper.ethz.ch'
SSH_OPTIONS
:
'
ssh
-q
-o
StrictHostKeyChecking=no'
RSYNC_OPTIONS
:
'
-av
--no-perms
--no-owner
--no-group
--
delete
--exclude=*.ini
--exclude=*.conf
'
RSYNC_OPTIONS
:
'
-av
--no-perms
--no-owner
--no-group
--
exclude=*.ini
--exclude=*.conf
--exclude=*.pyc
'
script
:
-
'
apk
update
>/dev/null
&&
apk
add
rsync
openssh-client
>/dev/null'
-
'
eval
$(ssh-agent
-s)
&&
echo
"$CI_SSH_PRIVATE_KEY"
|
ssh-add
-'
-
'
echo
"uploading
files
to
${PRODUCTION_SERVER}..."'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/testmanagementserver/
${PRODUCTION_SERVER}:flocklab_bin/testmanagementserver/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/user/
${PRODUCTION_SERVER}:public_html/user/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/testmanagement/
${PRODUCTION_SERVER}:testmanagement/'
-
'
rsync
${RSYNC_OPTIONS}
-e
"${SSH_OPTIONS}"
server/webserver/user/
${PRODUCTION_SERVER}:public_html/user/'
only
:
refs
:
-
master
...
...
server/testmanagementserver/linktests/linktest_dpp.xml
View file @
0825cbba
...
...
@@ -3,7 +3,7 @@
<!-- General configuration -->
<generalConf>
<name>
DPP link test
</name>
<description>
TX_POWER=0xc
0
</description>
<description>
500s test CC43
0
</description>
<scheduleAsap><durationSecs>
300
</durationSecs></scheduleAsap>
<emailResults>
no
</emailResults>
</generalConf>
...
...
server/testmanagementserver/linktests/linktest_tmote.xml
View file @
0825cbba
...
...
@@ -4,7 +4,7 @@
<generalConf>
<name>
LinkMeasurement
</name>
<description>
500
s test tmote
500s test tmote
</description>
<scheduleAsap>
<durationSecs>
500
</durationSecs>
...
...
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