Skip to content

Commit c03d035

Browse files
karuturikaruturi
committed
Merge release branch 4.8 to 4.9
* 4.8: server: give more memory to tests packaging: Marvin and integration-tests packages
2 parents 227ff38 + a54a3b5 commit c03d035

11 files changed

Lines changed: 182 additions & 9 deletions

File tree

‎client/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<artifactId>cloudstack</artifactId>
2020
<version>4.9.0</version>
2121
</parent>
22+
2223
<dependencies>
2324
<dependency>
2425
<groupId>org.apache.cloudstack</groupId>

‎debian/cloudstack-integration-tests.install‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
/usr/share/cloudstack-integration-tests/*

‎debian/cloudstack-marvin.install‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
/usr/share/cloudstack-marvin/Marvin*.tar.gz

‎debian/cloudstack-marvin.postinst‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/sh
2+
3+
# Licensed to the Apache Software Foundation (ASF) under one
4+
# or more contributor license agreements. See the NOTICE file
5+
# distributed with this work for additional information
6+
# regarding copyright ownership. The ASF licenses this file
7+
# to you under the Apache License, Version 2.0 (the
8+
# "License"); you may not use this file except in compliance
9+
# with the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing,
14+
# software distributed under the License is distributed on an
15+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
# KIND, either express or implied. See the License for the
17+
# specific language governing permissions and limitations
18+
# under the License.
19+
20+
set -e
21+
22+
pip install --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
23+
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz

‎debian/control‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,13 @@ Package: cloudstack-docs
4545
Architecture: all
4646
Depends: ${misc:Depends}
4747
Description: The CloudStack documentation
48+
49+
Package: cloudstack-marvin
50+
Architecture: all
51+
Depends: ${misc:Depends}, python-pip, python-dev, libffi-dev
52+
Description: The CloudStack Marvin library
53+
54+
Package: cloudstack-integration-tests
55+
Architecture: all
56+
Depends: ${misc:Depends}, cloudstack-marvin (= ${source:Version})
57+
Description: The CloudStack Marvin integration tests

‎debian/rules‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ override_dh_auto_configure:
1313
echo VERSION=${VERSION} >> replace.properties.tmp
1414

1515
override_dh_auto_build:
16-
mvn -T C1.5 clean package -Psystemvm -DskipTests -Dsystemvm \
16+
mvn -T C1.5 clean package -Psystemvm,developer -Dsystemvm \
1717
-Dcs.replace.properties=replace.properties.tmp \
1818
-Dmaven.repo.local=$(HOME)/.m2/repository \
1919
${ACS_BUILD_OPTS}
@@ -125,6 +125,14 @@ override_dh_auto_install:
125125
cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml
126126
install -D packaging/debian/init/cloud-usage $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
127127

128+
# cloudstack-marvin
129+
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-marvin
130+
cp tools/marvin/dist/Marvin-*.tar.gz $(DESTDIR)/usr/share/$(PACKAGE)-marvin/
131+
132+
# cloudstack-integration-tests
133+
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-integration-tests
134+
cp -r test/integration/* $(DESTDIR)/usr/share/$(PACKAGE)-integration-tests/
135+
128136
override_dh_installinit:
129137
dh_installinit -pcloudstack-management -pcloudstack-agent -pcloudstack-usage --onlyscripts --no-start
130138

‎packaging/centos63/cloud.spec‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,24 @@ Group: System Environment/Libraries
169169
%description cli
170170
Apache CloudStack command line interface
171171

172+
%package marvin
173+
Summary: Apache CloudStack Marvin library
174+
Requires: python-pip
175+
Requires: gcc
176+
Requires: python-devel
177+
Requires: libffi-devel
178+
Requires: openssl-devel
179+
Group: System Environment/Libraries
180+
%description marvin
181+
Apache CloudStack Marvin library
182+
183+
%package integration-tests
184+
Summary: Apache CloudStack Marvin integration tests
185+
Requires: %{name}-marvin = %{_ver}
186+
Group: System Environment/Libraries
187+
%description integration-tests
188+
Apache CloudStack Marvin integration tests
189+
172190
%if "%{_ossnoss}" == "noredist"
173191
%package mysql-ha
174192
Summary: Apache CloudStack Balancing Strategy for MySQL
@@ -197,18 +215,18 @@ if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then
197215
echo "Executing mvn packaging with non-redistributable libraries"
198216
if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
199217
echo "Executing mvn noredist packaging with simulator ..."
200-
mvn -Psystemvm -Dnoredist -Dsimulator clean package
218+
mvn -Psystemvm,developer -Dnoredist -Dsimulator clean package
201219
else
202220
echo "Executing mvn noredist packaging without simulator..."
203-
mvn -Psystemvm -Dnoredist clean package
221+
mvn -Psystemvm,developer -Dnoredist clean package
204222
fi
205223
else
206224
if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
207225
echo "Executing mvn default packaging simulator ..."
208-
mvn -Psystemvm -Dsimulator clean package
226+
mvn -Psystemvm,developer -Dsimulator clean package
209227
else
210228
echo "Executing mvn default packaging without simulator ..."
211-
mvn -Psystemvm clean package
229+
mvn -Psystemvm,developer clean package
212230
fi
213231
fi
214232

@@ -344,6 +362,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
344362
cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/
345363
install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py
346364

365+
# Marvin
366+
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
367+
cp tools/marvin/dist/Marvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
368+
369+
# integration-tests
370+
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
371+
cp -r test/integration/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests/
372+
347373
# MYSQL HA
348374
if [ "x%{_ossnoss}" == "xnoredist" ] ; then
349375
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
@@ -361,6 +387,10 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage
361387
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
362388
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
363389
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
390+
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
391+
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
392+
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
393+
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
364394
if [ "x%{_ossnoss}" == "xnoredist" ] ; then
365395
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
366396
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
@@ -533,6 +563,10 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
533563
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
534564
fi
535565

566+
%post marvin
567+
pip install --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
568+
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
569+
536570
#No default permission as the permission setup is complex
537571
%files management
538572
%defattr(-,root,root,-)
@@ -639,6 +673,16 @@ fi
639673
%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
640674
%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
641675

676+
%files marvin
677+
%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
678+
%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
679+
%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
680+
681+
%files integration-tests
682+
%attr(0755,root,root) %{_datadir}/%{name}-integration-tests/*
683+
%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
684+
%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
685+
642686
%if "%{_ossnoss}" == "noredist"
643687
%files mysql-ha
644688
%defattr(0644,cloud,cloud,0755)

‎packaging/centos7/cloud.spec‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,24 @@ Group: System Environment/Libraries
144144
%description cli
145145
Apache CloudStack command line interface
146146

147+
%package marvin
148+
Summary: Apache CloudStack Marvin library
149+
Requires: python-pip
150+
Requires: gcc
151+
Requires: python-devel
152+
Requires: libffi-devel
153+
Requires: openssl-devel
154+
Group: System Environment/Libraries
155+
%description marvin
156+
Apache CloudStack Marvin library
157+
158+
%package integration-tests
159+
Summary: Apache CloudStack Marvin integration tests
160+
Requires: %{name}-marvin = %{_ver}
161+
Group: System Environment/Libraries
162+
%description integration-tests
163+
Apache CloudStack Marvin integration tests
164+
147165
%if "%{_ossnoss}" == "noredist"
148166
%package mysql-ha
149167
Summary: Apache CloudStack Balancing Strategy for MySQL
@@ -178,7 +196,7 @@ if [ "%{_sim}" == "SIMULATOR" -o "%{_sim}" == "simulator" ] ; then
178196
FLAGS="$FLAGS -Dsimulator"
179197
fi
180198

181-
mvn -Psystemvm -DskipTests $FLAGS clean package
199+
mvn -Psystemvm,developer -DskipTests $FLAGS clean package
182200

183201
%install
184202
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -316,6 +334,14 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
316334
cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{python_sitearch}/
317335
install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{python_sitearch}/cloudapis.py
318336

337+
# Marvin
338+
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
339+
cp tools/marvin/dist/Marvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
340+
341+
# integration-tests
342+
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
343+
cp -r test/integration/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests/
344+
319345
# MYSQL HA
320346
if [ "x%{_ossnoss}" == "xnoredist" ] ; then
321347
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
@@ -333,6 +359,10 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage
333359
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
334360
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
335361
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
362+
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
363+
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
364+
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
365+
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
336366
if [ "x%{_ossnoss}" == "xnoredist" ] ; then
337367
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
338368
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
@@ -430,6 +460,10 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
430460
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
431461
fi
432462

463+
%post marvin
464+
pip install --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
465+
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
466+
433467
#No default permission as the permission setup is complex
434468
%files management
435469
%defattr(-,root,root,-)
@@ -535,6 +569,16 @@ fi
535569
%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
536570
%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
537571

572+
%files marvin
573+
%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
574+
%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
575+
%{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
576+
577+
%files integration-tests
578+
%attr(0755,root,root) %{_datadir}/%{name}-integration-tests/*
579+
%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE
580+
%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE
581+
538582
%if "%{_ossnoss}" == "noredist"
539583
%files mysql-ha
540584
%defattr(0644,cloud,cloud,0755)

‎pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@
4444
<url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
4545
</issueManagement>
4646

47+
<repositories>
48+
<repository>
49+
<id>juniper-contrail</id>
50+
<url>http://juniper.github.io/contrail-maven/snapshots</url>
51+
</repository>
52+
</repositories>
53+
4754
<properties>
4855
<cs.jdk.version>1.7</cs.jdk.version>
4956
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎server/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<groupId>org.apache.maven.plugins</groupId>
181181
<artifactId>maven-surefire-plugin</artifactId>
182182
<configuration>
183-
<argLine>-Xmx1024m -Djava.security.egd=file:/dev/./urandom</argLine>
183+
<argLine>-Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom</argLine>
184184
<excludes>
185185
<exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude>
186186
<exclude>com/cloud/upgrade/AdvanceZone223To224UpgradeTest</exclude>

0 commit comments

Comments
 (0)