git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix make sync in test infra based on lxc containers
[sfa.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6279ed1
..
ddfac30
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-150,7
+150,7
@@
SSHCOMMAND:=ssh root@$(PLC)
else
ifdef PLCHOSTLXC
SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
else
ifdef PLCHOSTLXC
SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC)
ssh $(GUESTHOSTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC)
virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env
else
ifdef PLCHOSTVS
SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
else
ifdef PLCHOSTVS
SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
@@
-194,6
+194,7
@@
syncconfig:
synctest: synccheck
+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
syncrestart: synccheck
synctest: synccheck
+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
syncrestart: synccheck
+ -$(SSHCOMMAND) systemctl --system daemon-reload
$(SSHCOMMAND) service sfa restart
syncmig:
$(SSHCOMMAND) service sfa restart
syncmig: