apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

travis: use explicit change directory and use -pl to build rat check (#3472)

Browse Source 
This tries to fix build failures seen in job 1 of Travis. Also fixes a pylint issue.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2019-07-05 15:47:44 +05:30 committed by GitHub
parent 7ed3dc33b3
commit c93630f125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@ -909,6 +909,7 @@
<exclude>**/*.iso</exclude> <exclude>**/*.iso</exclude>
<exclude>**/*.tgz</exclude> <exclude>**/*.tgz</exclude>
<exclude>**/*.zip</exclude> <exclude>**/*.zip</exclude>
<exclude>**/*.vhd*</exclude>
<exclude>**/target/**</exclude> <exclude>**/target/**</exclude>
<exclude>**/.vagrant</exclude> <exclude>**/.vagrant</exclude>
<exclude>**/*.json</exclude> <exclude>**/*.json</exclude>
@ -934,15 +935,7 @@
<exclude>debian/source/format</exclude> <exclude>debian/source/format</exclude>
<exclude>dist/console-proxy/js/jquery.js</exclude> <exclude>dist/console-proxy/js/jquery.js</exclude>
<exclude>plugins/hypervisors/hyperv/conf/agent.properties</exclude> <exclude>plugins/hypervisors/hyperv/conf/agent.properties</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln</exclude> <exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj</exclude>
<exclude>plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.settings</exclude>
<exclude>scripts/installer/windows/acs_license.rtf</exclude> <exclude>scripts/installer/windows/acs_license.rtf</exclude>
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude> <exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
<exclude>services/console-proxy/server/conf/agent.properties</exclude> <exclude>services/console-proxy/server/conf/agent.properties</exclude>

2
systemvm/debian/opt/cloud/bin/configure.py
View File

@ -67,7 +67,7 @@ class CsPassword(CsDataBag):
url = "http://%s:8080/" % server_ip url = "http://%s:8080/" % server_ip
payload = {"ip": vm_ip, "password": password, "token": token} payload = {"ip": vm_ip, "password": password, "token": token}
data = urllib.urlencode(payload) data = urllib.urlencode(payload)
request = urllib2.Request(url, data=data, headers={"DomU_Request" : "save_password"}) request = urllib2.Request(url, data=data, headers={"DomU_Request": "save_password"})
try: try:
resp = urllib2.urlopen(request, data) resp = urllib2.urlopen(request, data)
logging.debug("Update password server result: http:%s, content:%s" % (resp.code, resp.read())) logging.debug("Update password server result: http:%s, content:%s" % (resp.code, resp.read()))

9
tools/travis/install.sh
View File

@ -25,14 +25,15 @@ export MAVEN_OPTS="-Xmx4096m -XX:MaxPermSize=800m -Djava.security.egd=file:/dev/
set -e set -e
if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then if [ $TEST_SEQUENCE_NUMBER -eq 1 ]; then
DIR=$(pwd)
# Pylint/pep8 systemvm python codebase # Pylint/pep8 systemvm python codebase
cd systemvm/test && bash -x runtests.sh && cd ../.. cd systemvm/test && bash -x runtests.sh
# Build noredist # Build noredist
git clone https://github.com/rhtyd/cloudstack-nonoss.git nonoss git clone https://github.com/rhtyd/cloudstack-nonoss.git nonoss && cd nonoss && bash -x install-non-oss.sh
cd nonoss && bash -x install-non-oss.sh && cd .. cd $DIR && echo $DIR
git clean -fdx . git clean -fdx .
# Perform rat checks # Perform rat checks
mvn -P developer,systemvm -Dsimulator -Dnoredist --projects='org.apache.cloudstack:cloudstack' org.apache.rat:apache-rat-plugin:0.12:check mvn -P developer,systemvm -Dsimulator -Dnoredist -pl . org.apache.rat:apache-rat-plugin:0.12:check
mvn -q -B -P developer,systemvm -Dsimulator -Dnoredist clean install mvn -q -B -P developer,systemvm -Dsimulator -Dnoredist clean install
else else
mvn -Pdeveloper -Dsimulator clean install -DskipTests -T4 | egrep "Building|Tests|SUCCESS|FAILURE" mvn -Pdeveloper -Dsimulator clean install -DskipTests -T4 | egrep "Building|Tests|SUCCESS|FAILURE"