1. photon
  2. Commit 1bcddef02ae919a63fa2fb03e0412492136cfaf9
Browse code

changing wget to sources: makecheck for falco and rubygem-builder

Change-Id: I6ca4d02015760844ea83c69a7109c032060327ef
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1654
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sarah Choi <sarahc@vmware.com>

Chang authored on 2016/11/09 10:06:26
Showing 2 changed files
SPECS/falco/falco.spec
History View file @ 1bcddef
... ... 
@@ -12,6 +12,11 @@ Source0:	https://github.com/draios/%{name}/archive/%{name}-%{version}.tar.gz
12 12 
 %define sha1 falco=c40840c6dcbd25fd1d0bf8aa2d1f77b1f5a7cde2
13 13 
 Source1:	https://github.com/draios/sysdig/archive/sysdig-0.10.1.tar.gz
14 14 
 %define sha1 sysdig=272b95ad02be4d194bba66d360ff935084d9c842
15 
+Source2:        http://stedolan.github.io/jq/download/linux64/jq
16 
+%define sha1 jq=e820e9e91c9cce6154f52949a3b2a451c4de8af4
17 
+Source3:        http://libvirt.org/sources/libvirt-2.0.0.tar.xz
18 
+%define sha1 libvirt=9a923b06df23f7a5526e4ec679cdadf4eb35a38f
19 
+
15 20 
 BuildRequires:	cmake
16 21 
 BuildRequires:	openssl-devel
17 22 
 BuildRequires:	curl
... ... 
@@ -40,6 +45,9 @@ Sysdig falco is an open source, behavioral activity monitor designed to detect a
40 40 
 %prep
41 41 
 %setup
42 42 
 %setup -T -D -a 1
43 
+chmod +x %{SOURCE2}
44 
+cp %{SOURCE2} /usr/bin
45 
+tar xf %{SOURCE3}
43 46
44 47 
 %build
45 48 
 mv sysdig-0.10.1 ../sysdig
... ... 
@@ -52,10 +60,8 @@ make install KERNELDIR="/lib/modules/%{KERNEL_VERSION}/build" DESTDIR=%{buildroo
52 52 
 %check
53 53 
 easy_install pip
54 54 
 pip install avocado-framework
55 
-wget http://stedolan.github.io/jq/download/linux64/jq
56 
-chmod +x ./jq
57 
-cp jq /usr/bin
58 
-pip install -r https://raw.githubusercontent.com/avocado-framework/avocado/master/requirements.txt
55 
+pip install fabric
56 
+pip install aexpect
59 57 
 test/run_regression_tests.sh
60 58
61 59 
 %clean
SPECS/rubygem-builder/rubygem-builder.spec
History View file @ 1bcddef
... ... 
@@ -11,6 +11,8 @@ License: MIT
11 11 
 URL: http://onestepback.org
12 12 
 Source0: http://rubygems.org/gems/builder-%{version}.gem
13 13 
 %define sha1 builder=0ee99b207f9994864c2a21ce24be26eddafee7f1
14 
+Source1:  https://get.rvm.io/rvm-installer
15 
+%define sha1 rvm-installer=cf0184a1fc3c0854da5acc1134fac150461d7360
14 16 
 BuildRequires: ruby
15 17 
 Requires: ruby
16 18
... ... 
@@ -20,13 +22,15 @@ data simple to do. Currently the following builder objects are supported:
20 20
21 21 
 %prep
22 22 
 %setup -q -c -T
23 
+chmod +x  %{SOURCE1}
24 
+cp %{SOURCE1} .
23 25 
 %build
24 26 
 %install
25 27 
 gem install -V --local --force --install-dir %{buildroot}/%{gemdir} %{SOURCE0}
26 28
27 29 
 %check
30 
+./rvm-installer
28 31 
 pushd /usr/src/photon/BUILDROOT/rubygem-builder-%{version}-%{release}.x86_64/usr/lib/ruby/gems/2.3.0/gems/builder-%{version}/
29 
-curl -sSL https://get.rvm.io | bash -s stable --without-gems="rvm rubygems-bundler"
30 32 
 export PATH=$PATH:/usr/local/rvm/bin
31 33 
 rake test
32 34 
 popd