Sandro Bonazzola has uploaded a new change for review.
Change subject: Revert "packaging: fail the build if osinfo-defaults.properties
fails to parse"
......................................................................
Revert "packaging: fail the build if osinfo-defaults.properties fails to parse"
This reverts commit 3a6e5c2d77235181af4ba7b0841e6f91cdc9856f.
It's causing build failures on the stable branch.
Change-Id: I1e7eafbbbab0ad5cf0565048473d75315a66d744
Signed-Off-By: Sandro Bonazzola <sbona...@redhat.com>
---
M Makefile
D build/validations/pom.xml
D
build/validations/src/test/java/org/ovirt/engine/build/validations/OsinfoValidationsTest.java
M packaging/conf/osinfo-defaults.properties
4 files changed, 2 insertions(+), 50 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/34957/1
diff --git a/Makefile b/Makefile
index cd1347a..98e8159 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,6 @@
generated-files \
validations \
$(BUILD_FILE) \
- post-build-validations \
$(NULL)
generated-files: $(GENERATED)
@@ -231,11 +230,6 @@
$(BUILD_FILE):
$(MAKE) maven
-
-post-build-validations:
- if [ "$(BUILD_VALIDATION)" != 0 ]; then \
- ( cd build/validations && $(MVN) clean test
-Dosinfo.properties=../../packaging/conf/osinfo-defaults.properties ); \
- fi
clean:
# Clean maven generated stuff:
diff --git a/build/validations/pom.xml b/build/validations/pom.xml
deleted file mode 100644
index 6faa5d8..0000000
--- a/build/validations/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <name>build-validations</name>
- <artifactId>build-validations</artifactId>
- <groupId>org.ovirt.engine.build</groupId>
- <version>3.6.0-SNAPSHOT</version>
-
- <dependencies>
- <dependency>
- <groupId>org.ovirt.engine.core</groupId>
- <artifactId>utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/build/validations/src/test/java/org/ovirt/engine/build/validations/OsinfoValidationsTest.java
b/build/validations/src/test/java/org/ovirt/engine/build/validations/OsinfoValidationsTest.java
deleted file mode 100644
index eb588a8..0000000
---
a/build/validations/src/test/java/org/ovirt/engine/build/validations/OsinfoValidationsTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.build.validations;
-
-import org.junit.Test;
-import org.ovirt.engine.core.utils.osinfo.OsinfoPropertiesParser;
-
-public class OsinfoValidationsTest {
-
- @Test
- public void parse() throws Exception {
- try {
-
OsinfoPropertiesParser.parse(System.getProperty("osinfo.properties"));
- } catch (Exception e) {
- System.err.println("Ovirt-engine will fail to load with a broken
osinfo properties file.");
- System.err.println("Please fix the properties file or Osinfo.g4
grammer under org.ovirt.engine.core.utils.");
- throw e;
- }
- }
-}
diff --git a/packaging/conf/osinfo-defaults.properties
b/packaging/conf/osinfo-defaults.properties
index 97d345b..c51ba21 100644
--- a/packaging/conf/osinfo-defaults.properties
+++ b/packaging/conf/osinfo-defaults.properties
@@ -50,7 +50,7 @@
os.other.resources.minimum.ram.value = 256
os.other.resources.maximum.ram.value = 64000
os.other.resources.minimum.disksize.value = 1
-os.other.resources.minimum.numberOfCpus.value = 1
+os.other.resources.minimum.numberOsCpus.value = 1
os.other.devices.display.protocols.value = qxl/qxl,vnc/cirrus
os.other.devices.watchdog.models.value = i6300esb
@@ -278,7 +278,7 @@
os.ubuntu_12_04.derivedFrom.value = other_linux
os.ubuntu_12_04.resources.minimum.ram.value = 64
os.ubuntu_12_04.resources.minimum.disksize.value = 5120
-os.ubuntu_12_04.resources.minimum.numberOfCpus.value = 1
+os.ubuntu_12_04.resources.minimum.numberOsCpus.value = 1
os.ubuntu_12_10.id.value = 1253
os.ubuntu_12_10.name.value = Ubuntu Quantal Quetzal
--
To view, visit http://gerrit.ovirt.org/34957
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e7eafbbbab0ad5cf0565048473d75315a66d744
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
