From c94b2da9a89ab681705a7fb700f02b7d8d98ede1 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Sun, 22 Nov 2015 10:40:12 -0500 Subject: [PATCH 1/4] update release to 4.7.0 so it use proper packages and systemvm --- tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.centos6 | 6 +++--- tools/docker/Dockerfile.marvin | 4 ++-- tools/docker/systemtpl.sh | 10 +++++----- tools/marvin/setup.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 9d8b2e062b65..45eb6a216835 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -20,7 +20,7 @@ FROM ubuntu:14.04 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0" RUN apt-get -y update && apt-get install -y \ genisoimage \ diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6 index 87f6d0a369d4..0fa7bbee7faf 100644 --- a/tools/docker/Dockerfile.centos6 +++ b/tools/docker/Dockerfile.centos6 @@ -18,14 +18,14 @@ FROM centos:6 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0" ENV PKG_URL=http://jenkins.buildacloud.org/job/package-rhel63-master/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64 # install CloudStack RUN yum install -y nc wget \ - ${PKG_URL}/cloudstack-common-4.6.0-SNAPSHOT.el6.x86_64.rpm \ - ${PKG_URL}/cloudstack-management-4.6.0-SNAPSHOT.el6.x86_64.rpm + ${PKG_URL}/cloudstack-common-4.7.0-SNAPSHOT.el6.x86_64.rpm \ + ${PKG_URL}/cloudstack-management-4.7.0-SNAPSHOT.el6.x86_64.rpm RUN cd /etc/cloudstack/management; \ ln -s tomcat6-nonssl.conf tomcat6.conf; \ diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin index 4293f5632744..12d17671822c 100644 --- a/tools/docker/Dockerfile.marvin +++ b/tools/docker/Dockerfile.marvin @@ -20,11 +20,11 @@ FROM python:2 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0" ENV WORK_DIR=/marvin -ENV PKG_URL=http://jenkins.buildacloud.org/job/cloudstack-marvin-master/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.6.0-SNAPSHOT.tar.gz +ENV PKG_URL=http://jenkins.buildacloud.org/job/cloudstack-marvin-master/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.7.0-SNAPSHOT.tar.gz RUN pip install --upgrade paramiko nose requests RUN pip install --allow-external mysql-connector-python mysql-connector-python diff --git a/tools/docker/systemtpl.sh b/tools/docker/systemtpl.sh index f3035aea1d54..d0ddaf984940 100755 --- a/tools/docker/systemtpl.sh +++ b/tools/docker/systemtpl.sh @@ -41,19 +41,19 @@ fi URL="http://jenkins.buildacloud.org/job/build-systemvm64-master/lastSuccessfulBuild/artifact/tools/appliance/dist" case $HYPERVISOR in kvm) - TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-kvm.qcow2.bz2 + TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-kvm.qcow2.bz2 ;; xenserver) - TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-xen.vhd.bz2 + TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-xen.vhd.bz2 ;; vmware) - TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-vmware.ova + TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-vmware.ova ;; lxc) - TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-kvm.qcow2.bz2 + TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-kvm.qcow2.bz2 ;; ovm) - TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-ovm.raw.bz2 + TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-ovm.raw.bz2 ;; *) echo "ERROR: hypervisor not found" diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index 56ff80a4b321..9766f3e4250c 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -27,7 +27,7 @@ raise RuntimeError("python setuptools is required to build Marvin") -VERSION = "4.6.0-SNAPSHOT" +VERSION = "4.7.0-SNAPSHOT" setup(name="Marvin", version=VERSION, From 8483df131f7f4cc5d48b70274938e7ad1f8114a5 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Mon, 23 Nov 2015 21:22:01 -0500 Subject: [PATCH 2/4] update dockerfiles at version creation --- tools/build/build_asf.sh | 4 +++- tools/build/setnextversion.sh | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index 424b7887b60e..e76a5250fd1a 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -96,11 +96,13 @@ perl -pi -e "s/6.2.0-1-SNAPSHOT<\/cs.xapi.version>/ Date: Mon, 23 Nov 2015 21:22:39 -0500 Subject: [PATCH 3/4] update version including -SNAPSHOT so it reflect setnextversion.sh behavior --- tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.centos6 | 2 +- tools/docker/Dockerfile.marvin | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 45eb6a216835..25e58a49f73e 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -20,7 +20,7 @@ FROM ubuntu:14.04 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT" RUN apt-get -y update && apt-get install -y \ genisoimage \ diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6 index 0fa7bbee7faf..0f2847309eec 100644 --- a/tools/docker/Dockerfile.centos6 +++ b/tools/docker/Dockerfile.centos6 @@ -18,7 +18,7 @@ FROM centos:6 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT" ENV PKG_URL=http://jenkins.buildacloud.org/job/package-rhel63-master/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64 diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin index 12d17671822c..bd1ba7932ec0 100644 --- a/tools/docker/Dockerfile.marvin +++ b/tools/docker/Dockerfile.marvin @@ -20,7 +20,7 @@ FROM python:2 MAINTAINER "Apache CloudStack" -LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0" +LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT" ENV WORK_DIR=/marvin From d38c50b38c42d4ac88b934897d0e0721121acf7c Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Mon, 23 Nov 2015 21:37:13 -0500 Subject: [PATCH 4/4] fix Marvin package version --- tools/build/setnextversion.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh index e4667ecd6741..e2b2ec6ab22e 100755 --- a/tools/build/setnextversion.sh +++ b/tools/build/setnextversion.sh @@ -74,6 +74,7 @@ perl -pi -e "s/Version=\"[^\"]*\"/Version=\"$version\"/" tools/docker/Dockerfile perl -pi -e "s/Version=\"[^\"]*\"/Version=\"$version\"/" tools/docker/Dockerfile.centos6 perl -pi -e "s/cloudstack-common-(.*).el6.x86_64.rpm/cloudstack-common-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6 perl -pi -e "s/cloudstack-management-(.*)el6.x86_64.rpm/cloudstack-management-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6 +perl -pi -e "s/Marvin-(.*).tar.gz/Marvin-${version}.tar.gz/" tools/docker/Dockerfile.marvin # systemtpl.sh: system vm template version without -SNAPSHOT SYSTEMPVMTPL_VERSION=`echo $version|cut -d- -f1` perl -pi -e "s/[0-9].[0-9].[0-9]/${SYSTEMPVMTPL_VERSION}/" tools/docker/systemtpl.sh