Skip to content

Commit e27dd53

Browse files
committed
Fix build and version numbers
1 parent b0bf069 commit e27dd53

File tree

9 files changed

+135
-7
lines changed

9 files changed

+135
-7
lines changed

debian/changelog

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
cloudstack (4.16.1.0-SNAPSHOT) unstable; urgency=low
1+
cloudstack (4.17.0.0-SNAPSHOT) unstable; urgency=low
22

3-
* Update the version to 4.16.1.0-SNAPSHOT
3+
* Update the version to 4.17.0.0-SNAPSHOT
44

5-
-- the Apache CloudStack project <dev@cloudstack.apache.org> Wed, 10 Nov 2021 11:31:57 -0300
5+
-- the Apache CloudStack project <dev@cloudstack.apache.org> Wed, 10 Nov 2021 12:31:57 -0300
66

77
cloudstack (4.16.0.0) unstable; urgency=low
88

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import com.cloud.upgrade.dao.Upgrade41510to41520;
3333
import com.cloud.upgrade.dao.Upgrade41600to41610;
34+
import com.cloud.upgrade.dao.Upgrade41610to41700;
3435
import org.apache.cloudstack.utils.CloudStackVersion;
3536
import org.apache.commons.lang.StringUtils;
3637
import org.apache.log4j.Logger;
@@ -203,6 +204,7 @@ public DatabaseUpgradeChecker() {
203204
.next("4.15.1.0", new Upgrade41510to41520())
204205
.next("4.15.2.0", new Upgrade41520to41600())
205206
.next("4.16.0.0", new Upgrade41600to41610())
207+
.next("4.16.1.0", new Upgrade41610to41700())
206208
.build();
207209
}
208210

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
package com.cloud.upgrade.dao;
18+
19+
import com.cloud.upgrade.SystemVmTemplateRegistration;
20+
import com.cloud.utils.exception.CloudRuntimeException;
21+
import org.apache.log4j.Logger;
22+
23+
import java.io.InputStream;
24+
import java.sql.Connection;
25+
26+
public class Upgrade41610to41700 implements DbUpgrade, DbUpgradeSystemVmTemplate {
27+
28+
final static Logger LOG = Logger.getLogger(Upgrade41610to41700.class);
29+
private SystemVmTemplateRegistration systemVmTemplateRegistration;
30+
31+
@Override
32+
public String[] getUpgradableVersionRange() {
33+
return new String[] {"4.16.1.0", "4.17.0.0"};
34+
}
35+
36+
@Override
37+
public String getUpgradedVersion() {
38+
return "4.17.0.0";
39+
}
40+
41+
@Override
42+
public boolean supportsRollingUpgrade() {
43+
return false;
44+
}
45+
46+
@Override
47+
public InputStream[] getPrepareScripts() {
48+
final String scriptFile = "META-INF/db/schema-41610to41700.sql";
49+
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
50+
if (script == null) {
51+
throw new CloudRuntimeException("Unable to find " + scriptFile);
52+
}
53+
54+
return new InputStream[] {script};
55+
}
56+
57+
@Override
58+
public void performDataMigration(Connection conn) {
59+
}
60+
61+
@Override
62+
public InputStream[] getCleanupScripts() {
63+
final String scriptFile = "META-INF/db/schema-41610to41700-cleanup.sql";
64+
final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
65+
if (script == null) {
66+
throw new CloudRuntimeException("Unable to find " + scriptFile);
67+
}
68+
69+
return new InputStream[] {script};
70+
}
71+
72+
private void initSystemVmTemplateRegistration() {
73+
systemVmTemplateRegistration = new SystemVmTemplateRegistration("4.16.0");
74+
}
75+
76+
@Override
77+
public void updateSystemVmTemplates(Connection conn) {
78+
LOG.debug("Updating System Vm template IDs");
79+
initSystemVmTemplateRegistration();
80+
try {
81+
systemVmTemplateRegistration.updateSystemVmTemplates(conn);
82+
} catch (Exception e) {
83+
throw new CloudRuntimeException("Failed to find / register SystemVM template(s)");
84+
}
85+
}
86+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema upgrade cleanup from 4.16.1.0 to 4.17.0.0
20+
--;
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
--;
19+
-- Schema upgrade from 4.16.1.0 to 4.17.0.0
20+
--;

tools/checkstyle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
2323
<groupId>org.apache.cloudstack</groupId>
2424
<artifactId>checkstyle</artifactId>
25-
<version>4.16.1.0-SNAPSHOT</version>
25+
<version>4.17.0.0-SNAPSHOT</version>
2626

2727
<properties>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

tools/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
FROM ubuntu:20.04
2121

2222
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
23-
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
23+
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.17.0.0-SNAPSHOT"
2424

2525
ARG DEBIAN_FRONTEND=noninteractive
2626

tools/docker/Dockerfile.marvin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
FROM python:2
2121

2222
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
23-
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
23+
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.17.0.0-SNAPSHOT"
2424

2525
ENV WORK_DIR=/marvin
2626

tools/marvin/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
raise RuntimeError("python setuptools is required to build Marvin")
2828

2929

30-
VERSION = "4.16.1.0-SNAPSHOT"
30+
VERSION = "4.17.0.0-SNAPSHOT"
3131

3232
setup(name="Marvin",
3333
version=VERSION,

0 commit comments

Comments
 (0)