Browse code

Enable docker-in-docker

Change-Id: Ia9f4b688fecc7e8dd72384620c121c84b08e12ca
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4208
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>

Rui Gu authored on 2017/11/04 07:22:01
Showing 5 changed files
... ...
@@ -33,6 +33,9 @@ go build -v -o dist/calico-bgp-daemon -ldflags "-X main.VERSION=%{version} -s -w
33 33
 install -vdm 755 %{buildroot}%{_bindir}
34 34
 install ${GOPATH}/src/github.com/projectcalico/calico-bgp-daemon/dist/calico-bgp-daemon %{buildroot}%{_bindir}/
35 35
 
36
+#%check
37
+# No tests available for this pkg
38
+
36 39
 %files
37 40
 %defattr(-,root,root)
38 41
 %{_bindir}/calico-bgp-daemon
... ...
@@ -49,6 +49,9 @@ install -vpm 0755 -t %{buildroot}%{_bindir}/ dist/bird
49 49
 install -vpm 0755 -t %{buildroot}%{_bindir}/ dist/bird6
50 50
 install -vpm 0755 -t %{buildroot}%{_bindir}/ dist/birdcl
51 51
 
52
+#%check
53
+# No tests available for this pkg
54
+
52 55
 %files
53 56
 %defattr(-,root,root)
54 57
 %{_bindir}/bird
... ...
@@ -65,8 +65,14 @@ make DESTDIR=%{buildroot} install
65 65
 find %{buildroot} -name '*.la' -delete
66 66
 
67 67
 %check
68
-# Disable check. It requires docker which does not run in chroot.
69
-# Make check for netmgr should be run in vmware/netmgmt project.
68
+make distclean
69
+pushd build
70
+make -f Makefile.bootstrap
71
+sed -i 's/systemctl start docker && //g' tests/Makefile
72
+cp -p /etc/systemd/network/99-dhcp-en.network /etc/systemd/network/10-eth0.network
73
+sed -i 's/Name=e\*/Name=eth0/g' /etc/systemd/network/10-eth0.network
74
+make check
75
+popd
70 76
 
71 77
 %post
72 78
 /sbin/ldconfig
... ...
@@ -89,7 +95,6 @@ find %{buildroot} -name '*.la' -delete
89 89
 %{_lib64dir}/libnetmgrcli.a
90 90
 %{_lib64dir}/libnetmgrcli.so
91 91
 
92
-
93 92
 # %doc ChangeLog README COPYING
94 93
 
95 94
 %changelog
... ...
@@ -152,7 +152,8 @@ class PackageBuilderContainer(object):
152 152
                         constants.rpmPath: {'bind': constants.topDirPath + "/RPMS", 'mode': 'rw'},
153 153
                         constants.sourceRpmPath: {'bind': constants.topDirPath + "/SRPMS", 'mode': 'rw'},
154 154
                         constants.logPath + "/" + self.base.logName: {'bind': constants.topDirPath + "/LOGS", 'mode': 'rw'},
155
-                        chrootID + constants.topDirPath + "/BUILD": {'bind': constants.topDirPath + "/BUILD", 'mode': 'rw'}
155
+                        chrootID + constants.topDirPath + "/BUILD": {'bind': constants.topDirPath + "/BUILD", 'mode': 'rw'},
156
+                        constants.dockerUnixSocket: {'bind': constants.dockerUnixSocket, 'mode': 'rw'}
156 157
                     }
157 158
 
158 159
         containerName = containerTaskName
... ...
@@ -19,6 +19,7 @@ class constants(object):
19 19
     sourceRpmPath=""
20 20
     publishBuildDependencies=False
21 21
     packageWeightsPath=None
22
+    dockerUnixSocket="/var/run/docker.sock"
22 23
 
23 24
     noDepsPackageList=[
24 25
         "texinfo",