rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-15 05:26:21 +00:00
Code Issues Releases Wiki Activity

Fix Drone CI

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-07-10 15:45:31 +10:00
parent cbe24ca06b
commit 402af04b44
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netconf/netconf_linux.go
View File

@ -176,14 +176,14 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig, userSetHostname, userSetDNS bool
//apply network config //apply network config
for _, link := range links { for _, link := range links {
applyOuter(link, netCfg, wg, userSetHostname, userSetDNS) applyOuter(link, netCfg, &wg, userSetHostname, userSetDNS)
} }
wg.Wait() wg.Wait()
return err return err
} }
func applyOuter(link netlink.Link, netCfg *NetworkConfig, wg sync.WaitGroup, userSetHostname, userSetDNS bool) { func applyOuter(link netlink.Link, netCfg *NetworkConfig, wg *sync.WaitGroup, userSetHostname, userSetDNS bool) {
log.Debugf("applyOuter(%V, %v)", userSetHostname, userSetDNS) log.Debugf("applyOuter(%V, %v)", userSetHostname, userSetDNS)
match, ok := findMatch(link, netCfg) match, ok := findMatch(link, netCfg)
if !ok { if !ok {

14
scripts/ci
View File

@ -9,10 +9,12 @@ echo TEST
./scripts/test ./scripts/test
echo VALIDATE echo VALIDATE
./scripts/validate ./scripts/validate
echo PREPARE
./scripts/prepare # Drone servers kernel too old, and the integration tests often time out
echo PACKAGE #echo PREPARE
./scripts/package #./scripts/prepare
echo INTEGRATION-TEST #echo PACKAGE
./scripts/integration-test #./scripts/package
#echo INTEGRATION-TEST
#./scripts/integration-test

8
scripts/release
View File

@ -9,6 +9,14 @@ export INTEGRATION_TESTS=0
./scripts/ci ./scripts/ci
# from scripts/ci
echo PREPARE
./scripts/prepare
echo PACKAGE
./scripts/package
echo INTEGRATION-TEST
./scripts/integration-test
# make generated changelog # make generated changelog
lastrelease=$(hub release | grep -v rc | head -n1 | tr -d ' \r\n') lastrelease=$(hub release | grep -v rc | head -n1 | tr -d ' \r\n')
git log --format="%s: %b" ${lastrelease}..${VERSION} | grep "Merge pull" | sed 's/.*\(#.*\) from .*:\(.*\)/* \1: \2/g' > dist/artifacts/changelog.txt git log --format="%s: %b" ${lastrelease}..${VERSION} | grep "Merge pull" | sed 's/.*\(#.*\) from .*:\(.*\)/* \1: \2/g' > dist/artifacts/changelog.txt

18
tests/network_test.go
View File

@ -233,15 +233,15 @@ func (s *QemuSuite) TestNetworkCmds(c *C) {
s.RunQemuWithNetConsole(c, args...) s.RunQemuWithNetConsole(c, args...)
s.NetCheckOutput(c, s.NetCheckOutput(c,
"pre_cmds\n"+ "pre_cmds\n"+
"pre_up lo\n"+ "pre_up lo\n"+
"post_up lo\n"+ "post_up lo\n"+
"pre_up eth0\n"+ "pre_up eth0\n"+
"post_up eth0\n"+ "post_up eth0\n"+
"pre_up eth1\n"+ "pre_up eth1\n"+
"post_up eth1\n"+ "post_up eth1\n"+
"pre_up eth2\n"+ "pre_up eth2\n"+
"post_up eth2\n"+ "post_up eth2\n"+
"post_cmds\n", "post_cmds\n",
Equals, Equals,
"cat /var/log/net.log", "cat /var/log/net.log",
) )