-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update to latest melange and fix test suites * [Releng] Change Melange update site to 2018-01-19 build * use new location of nebula update site * update fsm sample with latest melange * wipeout workspace befor building * try to get more log on test failure * makes manifest changer more robust contributes to eclipse-gemoc/gemoc-studio-modeldebugging#25 and diverse-project/melange#105 * studio in using oxygen.2 * improve jenkins file - keep only one artefact per branch* - set periodic pipeline check * tee stdout and stderr to for the standard output and to console see #49 * add helper.setTargetPlatform in test that fail randomly * add launch conf in order to ease test devs * disable concurrent builds
- Loading branch information
Showing
30 changed files
with
275 additions
and
180 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,5 @@ build.acceleo | |
| *._trace | ||
| **/gemoc-gen/* | ||
| **/xtend-gen/* | ||
| node_modules | ||
| /package-lock.json | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,14 @@ | ||
| #!groovy | ||
| node { | ||
| properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10']]]); | ||
| properties([disableConcurrentBuilds(), [$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false], buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '1', daysToKeepStr: '', numToKeepStr: '10')), pipelineTriggers([[$class: 'PeriodicFolderTrigger', interval: '15m']])]) | ||
|
|
||
| catchError { | ||
| def mvnHome | ||
| stage('Preparation') { | ||
|
|
||
| // Get code from GitHub repositories | ||
| // Wipe the workspace so we are building completely clean | ||
| deleteDir() | ||
|
|
||
| // Get code from GitHub repositories | ||
|
|
||
| // this will check if there is a branch with the same name as the current branch (ie. the branch containing this Jenkinsfile) and use that for the checkout, but if there is no | ||
| // branch with the same name it will fall back to the master branch | ||
|
|
@@ -43,9 +46,9 @@ node { | |
| } | ||
| } | ||
| stage('Deployment') { | ||
| junit '**/target/surefire-reports/TEST-*.xml' | ||
| junit keepLongStdio: true, testResults: '**/target/surefire-reports/TEST-*.xml' | ||
| archiveArtifacts '**/target/products/*.zip,**/gemoc-studio/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.updatesite/target/repository/**' | ||
| } | ||
| } | ||
| step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: '', sendToIndividuals: true]) | ||
| step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: '[email protected]', sendToIndividuals: true]) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...ain/java/org/eclipse/gemoc/commons/eclipse/messagingsystem/ui/helper/TeeOutputStream.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2018 Inria and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v1.0 | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| * Contributors: | ||
| * Inria - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.gemoc.commons.eclipse.messagingsystem.ui.helper; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.OutputStream; | ||
|
|
||
| public final class TeeOutputStream extends OutputStream { | ||
|
|
||
| private final OutputStream out; | ||
| private final OutputStream tee; | ||
|
|
||
| public TeeOutputStream(OutputStream out, OutputStream tee) { | ||
| if (out == null) | ||
| throw new NullPointerException(); | ||
| else if (tee == null) | ||
| throw new NullPointerException(); | ||
|
|
||
| this.out = out; | ||
| this.tee = tee; | ||
| } | ||
|
|
||
| @Override | ||
| public void write(int b) throws IOException { | ||
| out.write(b); | ||
| tee.write(b); | ||
| } | ||
|
|
||
| @Override | ||
| public void write(byte[] b) throws IOException { | ||
| out.write(b); | ||
| tee.write(b); | ||
| } | ||
|
|
||
| @Override | ||
| public void write(byte[] b, int off, int len) throws IOException { | ||
| out.write(b, off, len); | ||
| tee.write(b, off, len); | ||
| } | ||
|
|
||
| @Override | ||
| public void flush() throws IOException { | ||
| out.flush(); | ||
| tee.flush(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| out.close(); | ||
| tee.close(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...rg.eclipse.gemoc.studio.tests.system/launch_conf/open-junit-eclipse-test-worskpace.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> | ||
| <booleanAttribute key="append.args" value="true"/> | ||
| <booleanAttribute key="askclear" value="true"/> | ||
| <booleanAttribute key="automaticAdd" value="true"/> | ||
| <booleanAttribute key="automaticValidate" value="true"/> | ||
| <stringAttribute key="bootstrap" value=""/> | ||
| <stringAttribute key="checked" value="[NONE]"/> | ||
| <booleanAttribute key="clearConfig" value="false"/> | ||
| <booleanAttribute key="clearws" value="false"/> | ||
| <booleanAttribute key="clearwslog" value="false"/> | ||
| <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/open-junit-eclipse-test-worskpace"/> | ||
| <booleanAttribute key="default" value="true"/> | ||
| <booleanAttribute key="includeOptional" value="true"/> | ||
| <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> | ||
| <stringAttribute key="pde.version" value="3.3"/> | ||
| <stringAttribute key="product" value="org.eclipse.sdk.ide"/> | ||
| <booleanAttribute key="show_selected_only" value="false"/> | ||
| <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> | ||
| <booleanAttribute key="tracing" value="false"/> | ||
| <booleanAttribute key="useCustomFeatures" value="false"/> | ||
| <booleanAttribute key="useDefaultConfig" value="true"/> | ||
| <booleanAttribute key="useDefaultConfigArea" value="true"/> | ||
| <booleanAttribute key="useProduct" value="true"/> | ||
| </launchConfiguration> |
42 changes: 42 additions & 0 deletions
42
...clipse.gemoc.studio.tests.system/launch_conf/org.eclipse.gemoc.studio.tests.system.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> | ||
| <booleanAttribute key="append.args" value="true"/> | ||
| <booleanAttribute key="askclear" value="false"/> | ||
| <booleanAttribute key="automaticAdd" value="true"/> | ||
| <booleanAttribute key="automaticValidate" value="true"/> | ||
| <stringAttribute key="bootstrap" value=""/> | ||
| <stringAttribute key="checked" value="[NONE]"/> | ||
| <booleanAttribute key="clearConfig" value="true"/> | ||
| <booleanAttribute key="clearws" value="true"/> | ||
| <booleanAttribute key="clearwslog" value="false"/> | ||
| <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> | ||
| <booleanAttribute key="default" value="true"/> | ||
| <booleanAttribute key="includeOptional" value="true"/> | ||
| <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> | ||
| <listEntry value="/org.eclipse.gemoc.studio.tests.system/xtend-gen/org/eclipse/gemoc/studio/tests/system/lwb/userstory/CreateSingleSequentialLanguageFromOfficialFSM_Test.java"/> | ||
| </listAttribute> | ||
| <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> | ||
| <listEntry value="1"/> | ||
| </listAttribute> | ||
| <stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/org.eclipse.gemoc.studio.tests.system/console.output}"/> | ||
| <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> | ||
| <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> | ||
| <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> | ||
| <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-8-oracle"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.gemoc.studio.tests.system.lwb.userstory.CreateSingleSequentialLanguageFromOfficialFSM_Test"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.gemoc.studio.tests.system"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> | ||
| <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/> | ||
| <stringAttribute key="pde.version" value="3.3"/> | ||
| <stringAttribute key="product" value="org.eclipse.sdk.ide"/> | ||
| <booleanAttribute key="run_in_ui_thread" value="false"/> | ||
| <booleanAttribute key="show_selected_only" value="false"/> | ||
| <booleanAttribute key="tracing" value="true"/> | ||
| <booleanAttribute key="useCustomFeatures" value="false"/> | ||
| <booleanAttribute key="useDefaultConfig" value="true"/> | ||
| <booleanAttribute key="useDefaultConfigArea" value="false"/> | ||
| <booleanAttribute key="useProduct" value="true"/> | ||
| </launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.