Commit 688d7fe8 authored by Romain Bioteau's avatar Romain Bioteau
Browse files

tr(newCI) make studio works in a Docker container (#1276)

* update Jenkinsfile
* fix memory management
* use zip format for installers

[CI-346](https://bonitasoft.atlassian.net/browse/CI-346)
parent b9c44de7
......@@ -31,8 +31,7 @@
<requestedExecutionLevel>asInvoker</requestedExecutionLevel>
<singleInstanceCheck>1</singleInstanceCheck>
<overrideGtkButtonText>1</overrideGtkButtonText>
<compressionAlgorithm>lzma-ultra</compressionAlgorithm>
<lzmaUltraBlockSize>100</lzmaUltraBlockSize>
<compressionAlgorithm>zip</compressionAlgorithm>
<allowedLanguages>en es fr ja</allowedLanguages>
<customLanguageFileList>
<language>
......
......@@ -327,7 +327,7 @@
</goals>
<configuration>
<executable>/bin/bash</executable>
<commandlineArgs>-c "zip ${product.short.name}-${project.version}.zip -r ${product.short.name}-${project.version}.app &#38;&#38; curl --request POST -F exeFile=@${product.short.name}-${project.version}.zip ${macSignServiceURL} &gt; /tmp/${product.short.name}-${project.version}.zip &#38;&#38; cat /tmp/${product.short.name}-${project.version}.zip > ${product.short.name}-${project.version}.zip &#38;&#38; rm -r ${product.short.name}-${project.version}.app &#38;&#38; unzip ${product.short.name}-${project.version}.zip &#38;&#38; rm ${product.short.name}-${project.version}.zip"</commandlineArgs>
<commandlineArgs>-c "zip -q ${product.short.name}-${project.version}.zip -r ${product.short.name}-${project.version}.app &#38;&#38; curl --request POST -F exeFile=@${product.short.name}-${project.version}.zip ${macSignServiceURL} &gt; /tmp/${product.short.name}-${project.version}.zip &#38;&#38; cat /tmp/${product.short.name}-${project.version}.zip > ${product.short.name}-${project.version}.zip &#38;&#38; rm -r ${product.short.name}-${project.version}.app &#38;&#38; unzip -q ${product.short.name}-${project.version}.zip &#38;&#38; rm ${product.short.name}-${project.version}.zip"</commandlineArgs>
<workingDirectory>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/</workingDirectory>
</configuration>
</execution>
......@@ -409,7 +409,7 @@
</goals>
<configuration>
<executable>/bin/bash</executable>
<commandlineArgs>-c "mv ${product.short.name}-${project.version}-osx ${product.short.name}-${project.version}-osx.app &#38;&#38; zip ${product.short.name}-${project.version}-osx.zip -r ${product.short.name}-${project.version}-osx.app &#38;&#38; curl --request POST -F exeFile=@${product.short.name}-${project.version}-osx.zip ${macBuildAndSignInstallerServiceURL} &gt; /tmp/${product.short.name}-${project.version}-osx.zip &#38;&#38; cat /tmp/${product.short.name}-${project.version}-osx.zip > ${product.short.name}-${project.version}-osx.zip &#38;&#38; unzip ${product.short.name}-${project.version}-osx.zip &#38;&#38; rm ${product.short.name}-${project.version}-osx.zip"</commandlineArgs>
<commandlineArgs>-c "mv ${product.short.name}-${project.version}-osx ${product.short.name}-${project.version}-osx.app &#38;&#38; zip -q ${product.short.name}-${project.version}-osx.zip -r ${product.short.name}-${project.version}-osx.app &#38;&#38; curl --request POST -F exeFile=@${product.short.name}-${project.version}-osx.zip ${macBuildAndSignInstallerServiceURL} &gt; /tmp/${product.short.name}-${project.version}-osx.zip &#38;&#38; cat /tmp/${product.short.name}-${project.version}-osx.zip > ${product.short.name}-${project.version}-osx.zip &#38;&#38; unzip -q ${product.short.name}-${project.version}-osx.zip &#38;&#38; rm ${product.short.name}-${project.version}-osx.zip"</commandlineArgs>
<workingDirectory>${project.build.directory}/installers/output/</workingDirectory>
</configuration>
</execution>
......
......@@ -252,6 +252,7 @@ public class UIDesignerServerManager {
: "\"" + locateUIDjar() + "\"" + System.getProperty("path.separator") + "\""
+ cpJar.getAbsolutePath() + "\"",
"org.apache.tomcat.maven.runner.Tomcat7RunnerCli",
"-Xmx256m",
workspaceSystemProperties.getPageRepositoryLocation(),
workspaceSystemProperties.getWidgetRepositoryLocation(),
workspaceSystemProperties.getFragmentRepositoryLocation(),
......
......@@ -84,11 +84,6 @@ public class TomcatVmArgsBuilderTest {
assertThat(tomcatVmArgsBuilder.getVMArgs("")).contains("-Djava.util.logging.config.file=").contains("logging.properties");
}
@Test
public void should_launch_tomcat_with_768m_of_max_memoty_heap_space() throws Exception {
assertThat(tomcatVmArgsBuilder.getVMArgs("")).contains("-Xmx768m");
}
@Test
public void should_launch_tomcat_with_bonita_csrf_cookie_path() throws Exception {
assertThat(tomcatVmArgsBuilder.getVMArgs("")).contains("-Dbonita.csrf.cookie.path=\"/\"");
......
......@@ -102,9 +102,7 @@ public class TomcatVmArgsBuilder {
}
protected void addMemoryOptions(final StringBuilder args) {
args.append("-Xms128m");
args.append(" ");
args.append("-Xmx768m");
args.append("-Xms128m -Xmx768m");
}
protected void addSystemProperty(final StringBuilder sBuilder, final String key, final String value) {
......
......@@ -8,8 +8,8 @@
<packaging>pom</packaging>
<name>Bonita Studio</name>
<properties>
<tychoVersion>1.0.0</tychoVersion>
<tychoExtrasVersion>1.0.0</tychoExtrasVersion>
<tychoVersion>1.1.0</tychoVersion>
<tychoExtrasVersion>1.1.0</tychoExtrasVersion>
<os-jvm-flags></os-jvm-flags>
<bundle.version>${project.version}</bundle.version>
<ui.designer.version>1.7.69</ui.designer.version>
......
......@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
<javaOPTS>-Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=TestSuite.hprof</javaOPTS>
<javaOPTS>-Xmx1g</javaOPTS>
<additionalArgs>-Dorg.eclipse.swt.browser.DefaultType=mozilla -Dbonita.noregister=1 -Dbonita.noExpireWarning=1 -Declipse.log.level=${tests.log.level}</additionalArgs>
<target.test.dir>${test.workspace.dir}/community/junit/lé test</target.test.dir>
</properties>
......
......@@ -52,7 +52,7 @@
<includes>
<include>**/*TestSuite.java</include>
</includes>
<argLine>-Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=SWTBotTests.hprof -Dorg.eclipse.swt.browser.DefaultType=mozilla -Dbonita.noregister=1 -Dbonita.noExpireWarning=1 -Declipse.log.level=${tests.log.level}</argLine>
<argLine>-Xmx1g -Dorg.eclipse.swt.browser.DefaultType=mozilla -Dbonita.noregister=1 -Dbonita.noExpireWarning=1 -Declipse.log.level=${tests.log.level}</argLine>
<appArgLine>-nl en -clean</appArgLine>
<osgiDataDirectory>${target.test.dir}</osgiDataDirectory>
<bundleStartLevel>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment