You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/27 20:10:59 UTC
[1/7] git commit: updated refs/heads/master to d7859ad
Repository: cloudstack
Updated Branches:
refs/heads/master 3358d6509 -> d7859ad21
CLOUDSTACK-9065: fix bug when creating packaging with noredist flag
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/adb0d3bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adb0d3bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adb0d3bb
Branch: refs/heads/master
Commit: adb0d3bb744f3c4ed86201a8f811f16a0b9f87de
Parents: 3f7a86d
Author: David Amorim Faria <da...@gmail.com>
Authored: Wed Nov 25 01:41:22 2015 +0100
Committer: David Amorim Faria <da...@gmail.com>
Committed: Wed Nov 25 01:41:22 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adb0d3bb/packaging/package.sh
----------------------------------------------------------------------
diff --git a/packaging/package.sh b/packaging/package.sh
index 484b398..8a87661 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -102,7 +102,7 @@ function packaging() {
echo ". executing rpmbuild"
cp "$DISTRO/cloud.spec" "$RPMDIR/SPECS"
- (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+$DEFOSSNOSS} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
+ (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec)
if [ $? -ne 0 ]; then
echo "RPM Build Failed "
exit 3
[2/7] git commit: updated refs/heads/master to d7859ad
Posted by re...@apache.org.
CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b0b69d9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b0b69d9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b0b69d9
Branch: refs/heads/master
Commit: 9b0b69d9c8cb6bdc0232c7af0efcb45974f533d2
Parents: 3f7a86d
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Nov 23 13:22:02 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Nov 25 11:26:10 2015 +0100
----------------------------------------------------------------------
scripts/vm/systemvm/injectkeys.sh | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b0b69d9/scripts/vm/systemvm/injectkeys.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh
index f69e331..6f224cd 100755
--- a/scripts/vm/systemvm/injectkeys.sh
+++ b/scripts/vm/systemvm/injectkeys.sh
@@ -85,14 +85,19 @@ systemvmpath=$3
command -v mkisofs > /dev/null || (echo "$(basename $0): mkisofs not found, please install or ensure PATH is accurate" ; exit 4)
-# if running into Docker as unprivileges, skip ssh verification as iso cannot be mounted.
-if [ -e /dev/loop0 ]; then
+# if running into Docker as unprivileges, skip ssh verification as iso cannot be mounted due to missing loop device.
+if [ -f /.dockerinit ]; then
+ if [ -e /dev/loop0 ]; then
+ # it's a docker instance with privileges.
+ inject_into_iso systemvm.iso $newpubkey
+ [ $? -ne 0 ] && exit 5
+ copy_priv_key $newprivkey
+ else
+ # this mean it's a docker instance, ssh key cannot be verify.
+ echo "We run inside Docker, skipping ssh key insertion in systemvm.iso"
+ fi
+else
inject_into_iso systemvm.iso $newpubkey
[ $? -ne 0 ] && exit 5
copy_priv_key $newprivkey
-else
- # this mean it's a docker instance, ssh key cannot be verify.
- echo "No loop device found, skipping ssh key insertion in systemvm.iso"
fi
-
-exit $?
[7/7] git commit: updated refs/heads/master to d7859ad
Posted by re...@apache.org.
Merge release branch 4.6 to master
* 4.6:
Revert "Change references of people.apache.org to home.apache.org in the test code"
Change references of people.apache.org to home.apache.org in the test code This closes #1123 Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7
CLOUDSTACK-9065: fix bug when creating packaging with noredist flag
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7859ad2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7859ad2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7859ad2
Branch: refs/heads/master
Commit: d7859ad21c24cb256c8ca62817fb11769b9f92e6
Parents: 3358d65 92913a1
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Nov 27 20:10:02 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Nov 27 20:10:02 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 2 +-
scripts/vm/systemvm/injectkeys.sh | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[5/7] git commit: updated refs/heads/master to d7859ad
Posted by re...@apache.org.
Merge pull request #1114 from davidamorimfaria/4.6
CLOUDSTACK-9065: fix bug when creating packaging with noredist flagFixes this:
```
$ bash -x package.sh -p noredist -d centos63
(...)
+ rpmbuild --define '_topdir /home/david/cloudstack/packaging/../dist/rpmbuild' '-D_ver 4.6.1' '-D_rel SNAPSHOT' '-D_prerelease 1' -D_ossnoss noredist -bb SPECS/cloud.spec
error: Macro %_ossnoss has empty body
error: Macro %_ossnoss has empty body
error: failed to stat /home/david/cloudstack/dist/rpmbuild/noredist: No such file or directory
+ '[' 1 -ne 0 ']'
+ echo 'RPM Build Failed '
RPM Build Failed
+ exit 3
```
It was missing quotes around the rpmbuild argument '-D_ossnoss noredist'.
* pr/1114:
CLOUDSTACK-9065: fix bug when creating packaging with noredist flag
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad2bcc08
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad2bcc08
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad2bcc08
Branch: refs/heads/master
Commit: ad2bcc089ef118c86fedfcbfe079706bb77cdc7f
Parents: ab385c8 adb0d3b
Author: Daan Hoogland <da...@onecht.net>
Authored: Thu Nov 26 11:23:24 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Nov 26 11:23:24 2015 +0100
----------------------------------------------------------------------
packaging/package.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[6/7] git commit: updated refs/heads/master to d7859ad
Posted by re...@apache.org.
Merge pull request #1109 from remibergsma/fix-CLOUDSTACK-9077
CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7Fix regression from commit 3381154fafb7fa4f0a61d538f7c2550e48247787
The error seen on CentOS 7:
```
2015-11-20 21:51:16,161 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) No loop device found, skipping ssh key insertion in systemvm.iso
```
Instead of detecting `/dev/loop0` this checks if we run inside Docker.
Tested on CentOS 7 and that now works again as expected.
```
2015-11-23 16:20:16,777 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Executing: /bin/bash /var/lib/tomcat/webapps/client/WEB-INF/classes/scripts/vm/systemvm/injectkeys.sh /home/cloud/.ssh/id_rsa.pub /home/cl
oud/.ssh/id_rsa /var/lib/tomcat/webapps/client/WEB-INF/classes/vms/systemvm.iso
2015-11-23 16:20:16,821 DEBUG [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Execution is successful.
2015-11-23 16:20:16,827 INFO [c.c.s.ConfigurationServerImpl] (localhost-startStop-1:null) Injected public and private keys into systemvm iso with result : null
```
Pinging @pdion891 to have a look.
* pr/1109:
CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92913a15
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92913a15
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92913a15
Branch: refs/heads/master
Commit: 92913a154c00cb57a51e90c9622720062eb6a9cb
Parents: ad2bcc0 9b0b69d
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Nov 27 20:05:11 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Nov 27 20:05:11 2015 +0100
----------------------------------------------------------------------
scripts/vm/systemvm/injectkeys.sh | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[4/7] git commit: updated refs/heads/master to d7859ad
Posted by re...@apache.org.
Revert "Change references of people.apache.org to home.apache.org in the test code"
This reverts commit 001169f08f5d315620cb1860a82e4b08d996d8c9.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab385c81
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab385c81
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab385c81
Branch: refs/heads/master
Commit: ab385c814f5e76a0c7da3ed1ec0c333d2c3139c8
Parents: 001169f
Author: Srikanteswararao Talluri <ta...@apache.org>
Authored: Thu Nov 26 12:07:49 2015 +0530
Committer: Srikanteswararao Talluri <ta...@apache.org>
Committed: Thu Nov 26 12:07:49 2015 +0530
----------------------------------------------------------------------
.../integration/component/test_project_usage.py | 2 +-
.../component/test_reset_ssh_keypair.py | 2 +-
test/integration/component/test_tags.py | 2 +-
test/integration/component/test_usage.py | 2 +-
.../component/test_vm_passwdenabled.py | 2 +-
test/integration/component/test_volumes.py | 2 +-
.../testpaths/testpath_stopped_vm.py | 4 +--
tools/marvin/marvin/config/test_data.py | 36 ++++++++++----------
8 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index f249b33..cb95d89 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -98,7 +98,7 @@ class Services:
"iso": {
"displaytext": "Test ISO",
"name": "Test ISO",
- "url": "https://home.apache.org/~talluri/dummy.iso",
+ "url": "http://people.apache.org/~tsp/dummy.iso",
# Source URL where ISO is located
"isextractable": True,
"isfeatured": True,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/test/integration/component/test_reset_ssh_keypair.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py
index 4fd07fa..db7e9b8 100644
--- a/test/integration/component/test_reset_ssh_keypair.py
+++ b/test/integration/component/test_reset_ssh_keypair.py
@@ -188,7 +188,7 @@ class TestResetSSHKeypair(cloudstackTestCase):
# similar steps to get SSH key from web so as to make it ssh enabled
cmds = [
- "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password",
+ "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password",
"chmod +x /etc/init.d/cloud-set-guest-password",
"chkconfig --add cloud-set-guest-password",
"cd /etc/init.d;wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/" + \
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/test/integration/component/test_tags.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py
index 310f305..3552064 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -124,7 +124,7 @@ class Services:
{
"displaytext": "Dummy ISO",
"name": "Dummy ISO",
- "url": "https://home.apache.org/~talluri/dummy.iso",
+ "url": "http://people.apache.org/~tsp/dummy.iso",
# Source URL where ISO is located
"isextractable": True,
"isfeatured": True,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 11f1833..3bbef39 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -93,7 +93,7 @@ class Services:
"iso": {
"displaytext": "Test ISO",
"name": "Test ISO",
- "url": "https://home.apache.org/~talluri/dummy.iso",
+ "url": "http://people.apache.org/~tsp/dummy.iso",
# Source URL where ISO is located
"isextractable": True,
"isfeatured": True,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/test/integration/component/test_vm_passwdenabled.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py
index 0b036f7..d340031 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -167,7 +167,7 @@ class TestVMPasswordEnabled(cloudstackTestCase):
# chkconfig --add cloud-set-guest-password
cmds = [
- "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password",
+ "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password",
"chmod +x /etc/init.d/cloud-set-guest-password",
"chkconfig --add cloud-set-guest-password",
]
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index 39f6b52..12c8f9d 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -88,7 +88,7 @@ class Services:
{
"displaytext": "Test ISO",
"name": "testISO",
- "url": "https://home.apache.org/~talluri/dummy.iso",
+ "url": "http://people.apache.org/~tsp/dummy.iso",
# Source URL where ISO is located
"ostype": 'CentOS 5.3 (64-bit)',
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/test/integration/testpaths/testpath_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_stopped_vm.py b/test/integration/testpaths/testpath_stopped_vm.py
index 190fb13..927dbd9 100644
--- a/test/integration/testpaths/testpath_stopped_vm.py
+++ b/test/integration/testpaths/testpath_stopped_vm.py
@@ -829,8 +829,8 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase):
# similar steps to get SSH key from web so as to make it ssh enabled
cmds = [
- "cd /etc/init.d;wget https://home.apache.org/~talluri/ \
- cloud-set-guest-password",
+ "cd /etc/init.d;wget http://people.apache.org/~tsp/\
+ cloud-set-guest-password",
"chmod +x /etc/init.d/cloud-set-guest-password",
"chkconfig --add cloud-set-guest-password"]
for c in cmds:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab385c81/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 177fe29..3d4745d 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -744,7 +744,7 @@ test_data = {
"iso": {
"displaytext": "Test ISO",
"name": "ISO",
- "url": "https://home.apache.org/~talluri/dummy.iso",
+ "url": "http://people.apache.org/~tsp/dummy.iso",
"bootable": False,
"ispublic": False,
"ostype": "Other (64-bit)",
@@ -752,7 +752,7 @@ test_data = {
"iso1": {
"displaytext": "Test ISO 1",
"name": "ISO 1",
- "url": "https://home.apache.org/~talluri/dummy.iso",
+ "url": "http://people.apache.org/~tsp/dummy.iso",
"isextractable": True,
"isfeatured": True,
"ispublic": True,
@@ -761,7 +761,7 @@ test_data = {
"iso2": {
"displaytext": "Test ISO 2",
"name": "ISO 2",
- "url": "https://home.apache.org/~talluri/dummy.iso",
+ "url": "http://people.apache.org/~tsp/dummy.iso",
"isextractable": True,
"isfeatured": True,
"ispublic": True,
@@ -786,7 +786,7 @@ test_data = {
"name": "Centos",
"passwordenabled": False,
"ostype": "CentOS 6.3 (64-bit)",
- "url": "https://home.apache.org/~talluri/centos63.ova",
+ "url": "http://people.apache.org/~sanjeev/centos63.ova",
"format": "OVA",
"ispublic": "true"
},
@@ -804,7 +804,7 @@ test_data = {
"displaytext": "Windows 7 (64-bit)",
"name": "Windows 7 (64-bit)",
"passwordenabled": False,
- "url": "https://home.apache.org/~talluri/windows7.vhd",
+ "url": "http://people.apache.org/~sanjeev/windows7.vhd",
"format": "VHD",
"ostype": "Windows 7 (64-bit)",
"ispublic": "true",
@@ -836,7 +836,7 @@ test_data = {
"displaytext": "win2012",
"name": "win2012",
"passwordenabled": False,
- "url": "https://home.apache.org/~talluri/new-test-win.ova",
+ "url": "http://people.apache.org/~sanjeev/new-test-win.ova",
"format": "OVA",
"ostype": "Windows 8 (64-bit)",
},
@@ -844,7 +844,7 @@ test_data = {
"displaytext": "Rhel60",
"name": "Rhel60",
"passwordenabled": False,
- "url": "https://home.apache.org/~talluri/Rhel6-64bit.ova",
+ "url": "http://people.apache.org/~sanjeev/Rhel6-64bit.ova",
"format": "OVA",
"ostype": "Red Hat Enterprise Linux 6.0 (64-bit)"
},
@@ -852,7 +852,7 @@ test_data = {
"displaytext": "xs",
"name": "xs",
"passwordenabled": False,
- "url": "https://home.apache.org/~talluri/ttylinux_pv.vhd.bz2",
+ "url": "http://people.apache.org/~sanjeev/ttylinux_pv.vhd.bz2",
"format": "VHD"
},
"security_group": {"name": "custom_Sec_Grp"},
@@ -1064,7 +1064,7 @@ test_data = {
"displaytext": "RHEL7 (64-bit)",
"name": "RHEL 7 Insta1",
"passwordenabled": False,
- "url": "https://home.apache.org/~talluri/RHEL764bitwithtools.vhd",
+ "url": "http://people.apache.org/~sanjeev/RHEL764bitwithtools.vhd",
"format": "VHD" ,
"ostype": "RHEL 7 (64-bit)",
"ispublic": "true",
@@ -1518,7 +1518,7 @@ test_data = {
"displaytext": "Windows 8 (64-bit)",
"name": "win8withpvxen",
"passwordenabled": False,
- "url": "https://home.apache.org/~talluri/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd",
+ "url": "http://people.apache.org/~sanjeev/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd",
"format": "VHD" ,
"ostype": "Windows 8 (64-bit)",
"ispublic": "true",
@@ -1547,17 +1547,17 @@ test_data = {
"browser_upload_volume":{
"VHD": {
"diskname": "XenUploadVol",
- "url": "https://home.apache.org/~talluri/rajani-thin-volume.vhd",
+ "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.vhd",
"checksum": "09b08b6abb1b903fca7711d3ac8d6598",
},
"OVA": {
"diskname": "VMwareUploadVol",
- "url": "https://home.apache.org/~talluri/CentOS5.5(64bit)-vmware-autoscale.ova",
+ "url": "http://people.apache.org/~sanjeev/CentOS5.5(64bit)-vmware-autoscale.ova",
"checksum": "da997b697feaa2f1f6e0d4785b0cece2",
},
"QCOW2": {
"diskname": "KVMUploadVol",
- "url": "https://home.apache.org/~talluri/rajani-thin-volume.qcow2",
+ "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.qcow2",
"checksum": "02de0576dd3a61ab59c03fd795fc86ac",
},
'browser_resized_disk_offering': {
@@ -1570,7 +1570,7 @@ test_data = {
"VHD": {
"templatename": "XenUploadtemplate",
"displaytext": "XenUploadtemplate",
- "url": "https://home.apache.org/~talluri/centos56-x86_64.vhd.bz2",
+ "url": "http://people.apache.org/~sanjeev/centos56-x86_64.vhd.bz2",
"hypervisor":"XenServer",
"checksum": "09b08b6abb1b903fca7711d3ac8d6598",
"ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
@@ -1578,7 +1578,7 @@ test_data = {
"OVA": {
"templatename": "VMwareUploadtemplate",
"displaytext": "VMwareUploadtemplate",
- "url": "https://home.apache.org/~talluri/CentOS5.3-x86_64.ova",
+ "url": "http://people.apache.org/~sanjeev/CentOS5.3-x86_64.ova",
"checksum": "02de0576dd3a61ab59c03fd795fc86ac",
"hypervisor":"VMware",
"ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
@@ -1586,7 +1586,7 @@ test_data = {
"QCOW2": {
"templatename": "KVMUploadtemplate",
"displaytext": "VMwareUploadtemplate",
- "url": "https://home.apache.org/~talluri/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2",
+ "url": "http://people.apache.org/~sanjeev/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2",
"checksum": "da997b697feaa2f1f6e0d4785b0cece2",
"hypervisor":"KVM",
"ostypeid":"2e02e376-cdf3-11e4-beb3-8aa6272b57ef"
@@ -1661,7 +1661,7 @@ test_data = {
"name": "testISO",
"bootable": True,
"ispublic": False,
- "url": "https://home.apache.org/~talluri/CentOS-6.3-x86_64-bin-DVD1.iso",
+ "url": "http://people.apache.org/~sanjeev/CentOS-6.3-x86_64-bin-DVD1.iso",
"ostype": 'CentOS 6.3 (64-bit)',
"mode": 'HTTP_DOWNLOAD'
},
@@ -1676,7 +1676,7 @@ test_data = {
"isextractable": True,
"mode": "HTTP_DOWNLOAD",
"templatefilter": "self",
- "url": "https://home.apache.org/~talluri/systemvm64template-2014-09-30-4.3-vmware.ova",
+ "url": "http://people.apache.org/~sanjeev/systemvm64template-2014-09-30-4.3-vmware.ova",
"hypervisor": "vmware",
"format": "OVA",
"nicadapter": "vmxnet3",
[3/7] git commit: updated refs/heads/master to d7859ad
Posted by re...@apache.org.
Change references of people.apache.org to home.apache.org in the test code
This closes #1123
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/001169f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/001169f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/001169f0
Branch: refs/heads/master
Commit: 001169f08f5d315620cb1860a82e4b08d996d8c9
Parents: 3f7a86d
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Thu Nov 26 00:07:43 2015 +0530
Committer: Srikanteswararao Talluri <ta...@apache.org>
Committed: Thu Nov 26 11:41:11 2015 +0530
----------------------------------------------------------------------
.../integration/component/test_project_usage.py | 2 +-
.../component/test_reset_ssh_keypair.py | 2 +-
test/integration/component/test_tags.py | 2 +-
test/integration/component/test_usage.py | 2 +-
.../component/test_vm_passwdenabled.py | 2 +-
test/integration/component/test_volumes.py | 2 +-
.../testpaths/testpath_stopped_vm.py | 4 +--
tools/marvin/marvin/config/test_data.py | 36 ++++++++++----------
8 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index cb95d89..f249b33 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -98,7 +98,7 @@ class Services:
"iso": {
"displaytext": "Test ISO",
"name": "Test ISO",
- "url": "http://people.apache.org/~tsp/dummy.iso",
+ "url": "https://home.apache.org/~talluri/dummy.iso",
# Source URL where ISO is located
"isextractable": True,
"isfeatured": True,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_reset_ssh_keypair.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py
index db7e9b8..4fd07fa 100644
--- a/test/integration/component/test_reset_ssh_keypair.py
+++ b/test/integration/component/test_reset_ssh_keypair.py
@@ -188,7 +188,7 @@ class TestResetSSHKeypair(cloudstackTestCase):
# similar steps to get SSH key from web so as to make it ssh enabled
cmds = [
- "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password",
+ "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password",
"chmod +x /etc/init.d/cloud-set-guest-password",
"chkconfig --add cloud-set-guest-password",
"cd /etc/init.d;wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/" + \
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_tags.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py
index 3552064..310f305 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -124,7 +124,7 @@ class Services:
{
"displaytext": "Dummy ISO",
"name": "Dummy ISO",
- "url": "http://people.apache.org/~tsp/dummy.iso",
+ "url": "https://home.apache.org/~talluri/dummy.iso",
# Source URL where ISO is located
"isextractable": True,
"isfeatured": True,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 3bbef39..11f1833 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -93,7 +93,7 @@ class Services:
"iso": {
"displaytext": "Test ISO",
"name": "Test ISO",
- "url": "http://people.apache.org/~tsp/dummy.iso",
+ "url": "https://home.apache.org/~talluri/dummy.iso",
# Source URL where ISO is located
"isextractable": True,
"isfeatured": True,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_vm_passwdenabled.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py
index d340031..0b036f7 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -167,7 +167,7 @@ class TestVMPasswordEnabled(cloudstackTestCase):
# chkconfig --add cloud-set-guest-password
cmds = [
- "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password",
+ "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password",
"chmod +x /etc/init.d/cloud-set-guest-password",
"chkconfig --add cloud-set-guest-password",
]
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index 12c8f9d..39f6b52 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -88,7 +88,7 @@ class Services:
{
"displaytext": "Test ISO",
"name": "testISO",
- "url": "http://people.apache.org/~tsp/dummy.iso",
+ "url": "https://home.apache.org/~talluri/dummy.iso",
# Source URL where ISO is located
"ostype": 'CentOS 5.3 (64-bit)',
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/testpaths/testpath_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_stopped_vm.py b/test/integration/testpaths/testpath_stopped_vm.py
index 927dbd9..190fb13 100644
--- a/test/integration/testpaths/testpath_stopped_vm.py
+++ b/test/integration/testpaths/testpath_stopped_vm.py
@@ -829,8 +829,8 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase):
# similar steps to get SSH key from web so as to make it ssh enabled
cmds = [
- "cd /etc/init.d;wget http://people.apache.org/~tsp/\
- cloud-set-guest-password",
+ "cd /etc/init.d;wget https://home.apache.org/~talluri/ \
+ cloud-set-guest-password",
"chmod +x /etc/init.d/cloud-set-guest-password",
"chkconfig --add cloud-set-guest-password"]
for c in cmds:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 3d4745d..177fe29 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -744,7 +744,7 @@ test_data = {
"iso": {
"displaytext": "Test ISO",
"name": "ISO",
- "url": "http://people.apache.org/~tsp/dummy.iso",
+ "url": "https://home.apache.org/~talluri/dummy.iso",
"bootable": False,
"ispublic": False,
"ostype": "Other (64-bit)",
@@ -752,7 +752,7 @@ test_data = {
"iso1": {
"displaytext": "Test ISO 1",
"name": "ISO 1",
- "url": "http://people.apache.org/~tsp/dummy.iso",
+ "url": "https://home.apache.org/~talluri/dummy.iso",
"isextractable": True,
"isfeatured": True,
"ispublic": True,
@@ -761,7 +761,7 @@ test_data = {
"iso2": {
"displaytext": "Test ISO 2",
"name": "ISO 2",
- "url": "http://people.apache.org/~tsp/dummy.iso",
+ "url": "https://home.apache.org/~talluri/dummy.iso",
"isextractable": True,
"isfeatured": True,
"ispublic": True,
@@ -786,7 +786,7 @@ test_data = {
"name": "Centos",
"passwordenabled": False,
"ostype": "CentOS 6.3 (64-bit)",
- "url": "http://people.apache.org/~sanjeev/centos63.ova",
+ "url": "https://home.apache.org/~talluri/centos63.ova",
"format": "OVA",
"ispublic": "true"
},
@@ -804,7 +804,7 @@ test_data = {
"displaytext": "Windows 7 (64-bit)",
"name": "Windows 7 (64-bit)",
"passwordenabled": False,
- "url": "http://people.apache.org/~sanjeev/windows7.vhd",
+ "url": "https://home.apache.org/~talluri/windows7.vhd",
"format": "VHD",
"ostype": "Windows 7 (64-bit)",
"ispublic": "true",
@@ -836,7 +836,7 @@ test_data = {
"displaytext": "win2012",
"name": "win2012",
"passwordenabled": False,
- "url": "http://people.apache.org/~sanjeev/new-test-win.ova",
+ "url": "https://home.apache.org/~talluri/new-test-win.ova",
"format": "OVA",
"ostype": "Windows 8 (64-bit)",
},
@@ -844,7 +844,7 @@ test_data = {
"displaytext": "Rhel60",
"name": "Rhel60",
"passwordenabled": False,
- "url": "http://people.apache.org/~sanjeev/Rhel6-64bit.ova",
+ "url": "https://home.apache.org/~talluri/Rhel6-64bit.ova",
"format": "OVA",
"ostype": "Red Hat Enterprise Linux 6.0 (64-bit)"
},
@@ -852,7 +852,7 @@ test_data = {
"displaytext": "xs",
"name": "xs",
"passwordenabled": False,
- "url": "http://people.apache.org/~sanjeev/ttylinux_pv.vhd.bz2",
+ "url": "https://home.apache.org/~talluri/ttylinux_pv.vhd.bz2",
"format": "VHD"
},
"security_group": {"name": "custom_Sec_Grp"},
@@ -1064,7 +1064,7 @@ test_data = {
"displaytext": "RHEL7 (64-bit)",
"name": "RHEL 7 Insta1",
"passwordenabled": False,
- "url": "http://people.apache.org/~sanjeev/RHEL764bitwithtools.vhd",
+ "url": "https://home.apache.org/~talluri/RHEL764bitwithtools.vhd",
"format": "VHD" ,
"ostype": "RHEL 7 (64-bit)",
"ispublic": "true",
@@ -1518,7 +1518,7 @@ test_data = {
"displaytext": "Windows 8 (64-bit)",
"name": "win8withpvxen",
"passwordenabled": False,
- "url": "http://people.apache.org/~sanjeev/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd",
+ "url": "https://home.apache.org/~talluri/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd",
"format": "VHD" ,
"ostype": "Windows 8 (64-bit)",
"ispublic": "true",
@@ -1547,17 +1547,17 @@ test_data = {
"browser_upload_volume":{
"VHD": {
"diskname": "XenUploadVol",
- "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.vhd",
+ "url": "https://home.apache.org/~talluri/rajani-thin-volume.vhd",
"checksum": "09b08b6abb1b903fca7711d3ac8d6598",
},
"OVA": {
"diskname": "VMwareUploadVol",
- "url": "http://people.apache.org/~sanjeev/CentOS5.5(64bit)-vmware-autoscale.ova",
+ "url": "https://home.apache.org/~talluri/CentOS5.5(64bit)-vmware-autoscale.ova",
"checksum": "da997b697feaa2f1f6e0d4785b0cece2",
},
"QCOW2": {
"diskname": "KVMUploadVol",
- "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.qcow2",
+ "url": "https://home.apache.org/~talluri/rajani-thin-volume.qcow2",
"checksum": "02de0576dd3a61ab59c03fd795fc86ac",
},
'browser_resized_disk_offering': {
@@ -1570,7 +1570,7 @@ test_data = {
"VHD": {
"templatename": "XenUploadtemplate",
"displaytext": "XenUploadtemplate",
- "url": "http://people.apache.org/~sanjeev/centos56-x86_64.vhd.bz2",
+ "url": "https://home.apache.org/~talluri/centos56-x86_64.vhd.bz2",
"hypervisor":"XenServer",
"checksum": "09b08b6abb1b903fca7711d3ac8d6598",
"ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
@@ -1578,7 +1578,7 @@ test_data = {
"OVA": {
"templatename": "VMwareUploadtemplate",
"displaytext": "VMwareUploadtemplate",
- "url": "http://people.apache.org/~sanjeev/CentOS5.3-x86_64.ova",
+ "url": "https://home.apache.org/~talluri/CentOS5.3-x86_64.ova",
"checksum": "02de0576dd3a61ab59c03fd795fc86ac",
"hypervisor":"VMware",
"ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
@@ -1586,7 +1586,7 @@ test_data = {
"QCOW2": {
"templatename": "KVMUploadtemplate",
"displaytext": "VMwareUploadtemplate",
- "url": "http://people.apache.org/~sanjeev/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2",
+ "url": "https://home.apache.org/~talluri/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2",
"checksum": "da997b697feaa2f1f6e0d4785b0cece2",
"hypervisor":"KVM",
"ostypeid":"2e02e376-cdf3-11e4-beb3-8aa6272b57ef"
@@ -1661,7 +1661,7 @@ test_data = {
"name": "testISO",
"bootable": True,
"ispublic": False,
- "url": "http://people.apache.org/~sanjeev/CentOS-6.3-x86_64-bin-DVD1.iso",
+ "url": "https://home.apache.org/~talluri/CentOS-6.3-x86_64-bin-DVD1.iso",
"ostype": 'CentOS 6.3 (64-bit)',
"mode": 'HTTP_DOWNLOAD'
},
@@ -1676,7 +1676,7 @@ test_data = {
"isextractable": True,
"mode": "HTTP_DOWNLOAD",
"templatefilter": "self",
- "url": "http://people.apache.org/~sanjeev/systemvm64template-2014-09-30-4.3-vmware.ova",
+ "url": "https://home.apache.org/~talluri/systemvm64template-2014-09-30-4.3-vmware.ova",
"hypervisor": "vmware",
"format": "OVA",
"nicadapter": "vmxnet3",