You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/12/11 11:13:04 UTC
git commit: updated refs/heads/4.3 to 78051ae
Updated Branches:
refs/heads/4.3 79cb891ef -> 78051ae6b
Fixed CLOUDSTACK-5436
Fixed few RAT issues reported for new additions of files to repo.
Signed-off-by: Santhosh Edukulla <Sa...@citrix.com>
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/78051ae6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/78051ae6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/78051ae6
Branch: refs/heads/4.3
Commit: 78051ae6ba9d716ccdd8715b073db75e7ede0842
Parents: 79cb891
Author: Santhosh Edukulla <Sa...@citrix.com>
Authored: Tue Dec 10 05:23:40 2013 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Wed Dec 11 15:42:56 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/misc/build/CI.md | 18 ++++++++++++++++++
tools/marvin/marvin/misc/build/README.md | 18 ++++++++++++++++++
tools/marvin/marvin/misc/build/advanced_env.py | 7 +++++--
tools/marvin/marvin/misc/build/asf_test.cfg | 18 ++++++++++++++++++
tools/marvin/marvin/misc/build/bashUtils.py | 18 ++++++++++++++++++
.../marvin/marvin/misc/build/buildGenerator.py | 18 ++++++++++++++++++
tools/marvin/marvin/misc/build/configure.py | 17 +++++++++++++++++
tools/marvin/marvin/misc/build/hudson.sh | 17 +++++++++++++++++
tools/marvin/marvin/misc/build/kvm.cfg | 20 +++++++++++++++++++-
tools/marvin/marvin/misc/build/openport.py | 18 ++++++++++++++++++
tools/marvin/marvin/misc/build/redeploy.sh | 19 +++++++++++++++++++
tools/marvin/marvin/misc/build/restartMgmt.py | 17 +++++++++++++++++
.../marvin/marvin/misc/build/system.properties | 19 ++++++++++++++++++-
.../marvin/misc/build/testSetupSuccess.py | 17 +++++++++++++++++
tools/marvin/marvin/misc/build/vm-start.sh | 18 ++++++++++++++++++
tools/marvin/marvin/misc/build/vm-uninstall.sh | 17 +++++++++++++++++
tools/marvin/marvin/misc/build/xen.cfg | 20 +++++++++++++++++++-
tools/marvin/marvin/misc/build/xunitmp/setup.py | 9 +++++----
.../misc/build/xunitmp/xunitmultiprocess.py | 16 ++++++++++++++++
19 files changed, 312 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/CI.md
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/CI.md b/tools/marvin/marvin/misc/build/CI.md
index c320125..0daa597 100644
--- a/tools/marvin/marvin/misc/build/CI.md
+++ b/tools/marvin/marvin/misc/build/CI.md
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
about
=====
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/README.md
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/README.md b/tools/marvin/marvin/misc/build/README.md
index bf0e03c..8dd30db 100644
--- a/tools/marvin/marvin/misc/build/README.md
+++ b/tools/marvin/marvin/misc/build/README.md
@@ -1,3 +1,21 @@
+#Licensed to the Apache Software Foundation (ASF) under one
+#or more contributor license agreements. See the NOTICE file
+#distributed with this work for additional information
+#regarding copyright ownership. The ASF licenses this file
+#to you under the Apache License, Version 2.0 (the
+#"License"); you may not use this file except in compliance
+#with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing,
+#software distributed under the License is distributed on an
+#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#KIND, either express or implied. See the License for the
+#specific language governing permissions and limitations
+#under the License.
+
+
#Cloud AutoDeploy
Scripts here are used to refresh the builds of the management server with those
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/advanced_env.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/advanced_env.py b/tools/marvin/marvin/misc/build/advanced_env.py
index b01e912..07991f1 100644
--- a/tools/marvin/marvin/misc/build/advanced_env.py
+++ b/tools/marvin/marvin/misc/build/advanced_env.py
@@ -1,3 +1,4 @@
+
#!/usr/bin/env python
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -6,15 +7,17 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
+
'''
############################################################
# Experimental state of scripts
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/asf_test.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/asf_test.cfg b/tools/marvin/marvin/misc/build/asf_test.cfg
index b75827d..658afee 100644
--- a/tools/marvin/marvin/misc/build/asf_test.cfg
+++ b/tools/marvin/marvin/misc/build/asf_test.cfg
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
{
"zones": [
{
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/bashUtils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/bashUtils.py b/tools/marvin/marvin/misc/build/bashUtils.py
index f1bf471..d4e74f3 100644
--- a/tools/marvin/marvin/misc/build/bashUtils.py
+++ b/tools/marvin/marvin/misc/build/bashUtils.py
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
from optparse import OptionParser
from signal import alarm, signal, SIGALRM, SIGKILL
from subprocess import PIPE, Popen
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/buildGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/buildGenerator.py b/tools/marvin/marvin/misc/build/buildGenerator.py
index 6964943..5794067 100644
--- a/tools/marvin/marvin/misc/build/buildGenerator.py
+++ b/tools/marvin/marvin/misc/build/buildGenerator.py
@@ -1,5 +1,23 @@
#!/usr/bin/env python
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
from ConfigParser import ConfigParser
from jenkinsapi import api, jenkins, job
from time import sleep as delay
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/configure.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/configure.py b/tools/marvin/marvin/misc/build/configure.py
index 796ab2d..b571f53 100644
--- a/tools/marvin/marvin/misc/build/configure.py
+++ b/tools/marvin/marvin/misc/build/configure.py
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
from ConfigParser import ConfigParser
from bashUtils import bash
from marvin import configGenerator
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/hudson.sh
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/hudson.sh b/tools/marvin/marvin/misc/build/hudson.sh
index d5ece96..d4eb53b 100644
--- a/tools/marvin/marvin/misc/build/hudson.sh
+++ b/tools/marvin/marvin/misc/build/hudson.sh
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
hypervisor="kvm"
#Isolate the run into a virtualenv
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/kvm.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/kvm.cfg b/tools/marvin/marvin/misc/build/kvm.cfg
index d02eefa..630ccba 100644
--- a/tools/marvin/marvin/misc/build/kvm.cfg
+++ b/tools/marvin/marvin/misc/build/kvm.cfg
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
{
"zones": [
{
@@ -222,4 +240,4 @@
"port": 8096
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/openport.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/openport.py b/tools/marvin/marvin/misc/build/openport.py
index ab2726d..0c40b0a 100644
--- a/tools/marvin/marvin/misc/build/openport.py
+++ b/tools/marvin/marvin/misc/build/openport.py
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
from marvin import dbConnection
def _openIntegrationPort():
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/redeploy.sh
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/redeploy.sh b/tools/marvin/marvin/misc/build/redeploy.sh
index 4ddd302..a9c13cc 100755
--- a/tools/marvin/marvin/misc/build/redeploy.sh
+++ b/tools/marvin/marvin/misc/build/redeploy.sh
@@ -1,4 +1,23 @@
+
#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
#set -x
usage() {
printf "Usage: %s:\n
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/restartMgmt.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/restartMgmt.py b/tools/marvin/marvin/misc/build/restartMgmt.py
index fd005a8..be5c76a 100644
--- a/tools/marvin/marvin/misc/build/restartMgmt.py
+++ b/tools/marvin/marvin/misc/build/restartMgmt.py
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
from ConfigParser import ConfigParser
from optparse import OptionParser
import marvin
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/system.properties
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/system.properties b/tools/marvin/marvin/misc/build/system.properties
index a4e1e0f..07aa84e 100644
--- a/tools/marvin/marvin/misc/build/system.properties
+++ b/tools/marvin/marvin/misc/build/system.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
[cobbler]
#nic=network,gateway,cobbler_gateway
eth0=10.223.75.0/25,10.223.75.1,10.223.75.10
@@ -22,4 +39,4 @@ acs-qa-h11=d0:67:e5:ef:e0:1b,password,10.223.75.20
acs-qa-h20=d0:67:e5:ef:e0:ff,password,10.223.78.20
acs-qa-h21=d0:67:e5:ef:e0:2d,password,10.223.78.140
acs-qa-h23=d0:67:e5:f1:b1:36,password,10.223.75.21
-acs-qa-jenkins-slave=9e:2f:91:31:f4:8d,password,10.223.75.11
\ No newline at end of file
+acs-qa-jenkins-slave=9e:2f:91:31:f4:8d,password,10.223.75.11
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/testSetupSuccess.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/testSetupSuccess.py b/tools/marvin/marvin/misc/build/testSetupSuccess.py
index ed167a1..1bf2510 100644
--- a/tools/marvin/marvin/misc/build/testSetupSuccess.py
+++ b/tools/marvin/marvin/misc/build/testSetupSuccess.py
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
import marvin
import unittest
from marvin.cloudstackTestCase import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/vm-start.sh
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/vm-start.sh b/tools/marvin/marvin/misc/build/vm-start.sh
index 48878fb..e23f434 100755
--- a/tools/marvin/marvin/misc/build/vm-start.sh
+++ b/tools/marvin/marvin/misc/build/vm-start.sh
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
#!/bin/bash
# Starts a vm on the xenserver with a predefined MAC and name-label
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/vm-uninstall.sh
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/vm-uninstall.sh b/tools/marvin/marvin/misc/build/vm-uninstall.sh
index 48f2d74..3746050 100755
--- a/tools/marvin/marvin/misc/build/vm-uninstall.sh
+++ b/tools/marvin/marvin/misc/build/vm-uninstall.sh
@@ -1,4 +1,21 @@
+
#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
# Uninstalls a given VM
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/xen.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/xen.cfg b/tools/marvin/marvin/misc/build/xen.cfg
index bdeacda..5e9464b 100644
--- a/tools/marvin/marvin/misc/build/xen.cfg
+++ b/tools/marvin/marvin/misc/build/xen.cfg
@@ -1,3 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
{
"zones": [
{
@@ -222,4 +240,4 @@
"port": 8096
}
]
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/xunitmp/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/xunitmp/setup.py b/tools/marvin/marvin/misc/build/xunitmp/setup.py
index b5ad6d8..f27cbfd 100644
--- a/tools/marvin/marvin/misc/build/xunitmp/setup.py
+++ b/tools/marvin/marvin/misc/build/xunitmp/setup.py
@@ -2,12 +2,12 @@
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version .0 (the
+# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-.0
-#
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
+
import os
from setuptools import setup
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78051ae6/tools/marvin/marvin/misc/build/xunitmp/xunitmultiprocess.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/misc/build/xunitmp/xunitmultiprocess.py b/tools/marvin/marvin/misc/build/xunitmp/xunitmultiprocess.py
index 950a2e3..e119752 100644
--- a/tools/marvin/marvin/misc/build/xunitmp/xunitmultiprocess.py
+++ b/tools/marvin/marvin/misc/build/xunitmp/xunitmultiprocess.py
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
"""This plugin provides test results in the standard XUnit XML format.