Skip to content

update release to 4.7.0 so it use proper packages and systemvm #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pdion891 wants to merge 4 commits into from
Closed

update release to 4.7.0 so it use proper packages and systemvm #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c94b2da
update release to 4.7.0 so it use proper packages and systemvm
pdion891 Nov 22, 2015
8483df1
update dockerfiles at version creation
pdion891 Nov 24, 2015
e021864
update version including -SNAPSHOT so it reflect setnextversion.sh be…
pdion891 Nov 24, 2015
d38c50b
fix Marvin package version
pdion891 Nov 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion tools/build/build_asf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@ perl -pi -e "s/<cs.xapi.version>6.2.0-1-SNAPSHOT<\/cs.xapi.version>/<cs.xapi.ver
perl -pi -e "s/-SNAPSHOT//" tools/checkstyle/pom.xml
perl -pi -e "s/-SNAPSHOT//" deps/XenServerJava/pom.xml
perl -pi -e "s/-SNAPSHOT//" tools/apidoc/pom.xml
perl -pi -e "s/-SNAPSHOT//" Dockerfile
perl -pi -e "s/-SNAPSHOT//" build/replace.properties
perl -pi -e "s/-SNAPSHOT//" services/console-proxy/plugin/pom.xml
perl -pi -e "s/-SNAPSHOT//" tools/marvin/setup.py
perl -pi -e "s/-SNAPSHOT//" tools/marvin/marvin/deployAndRun.py
perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile
perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile.marvin
perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile.centos6
case "$currentversion" in
*-SNAPSHOT*)
perl -pi -e 's/-SNAPSHOT//' debian/rules
Expand Down
13 changes: 13 additions & 0 deletions tools/build/setnextversion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,19 @@ mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P sim
mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml
perl -pi -e "s/$currentversion/$version/" deps/XenServerJava/pom.xml
perl -pi -e "s/$currentversion/$version/" tools/apidoc/pom.xml

# Dockerfiles
perl -pi -e "s/Version=\"[^\"]*\"/Version=\"$version\"/" tools/docker/Dockerfile
perl -pi -e "s/Version=\"[^\"]*\"/Version=\"$version\"/" tools/docker/Dockerfile.marvin
# centos6 based 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

git clean -f

echo 'commit changes'
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
FROM ubuntu:14.04

MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT"

RUN apt-get -y update && apt-get install -y \
genisoimage \
Expand Down
6 changes: 3 additions & 3 deletions tools/docker/Dockerfile.centos6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
FROM centos:6

MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.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

# 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; \
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.marvin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
FROM python:2

MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT"

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
Expand Down
10 changes: 5 additions & 5 deletions tools/docker/systemtpl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/marvin/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down