You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/02/20 08:46:08 UTC
[camel] branch master updated (b91f477 -> 11842f5)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from b91f477 Regen
new 95f5438 Make olingo2 test setup deterministic
new 41b4568 CAMEL-11930: don't fail if no JUnit results found
new 11842f5 CAMEL-11930: pipeline e-mail support
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 15 +++++++++--
.../camel-olingo2/camel-olingo2-component/pom.xml | 30 ++++++++++++++--------
2 files changed, 33 insertions(+), 12 deletions(-)
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.
[camel] 01/03: Make olingo2 test setup deterministic
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 95f5438fbc447f529ba235d1239b0edecc2bfc74
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Feb 20 08:26:53 2018 +0100
Make olingo2 test setup deterministic
`camel-olingo2-component` needs a generated sample project for tests,
this is done in a separate profile that is active by default, this poses
an issue if the generated project already exists. This adds
maven-clean-plugin execution to remove that sample project if it already
exists.
Now the test should be deterministic and should not fail the build
regardless of the existence of the sample project.
---
.../camel-olingo2/camel-olingo2-component/pom.xml | 30 ++++++++++++++--------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index a803858..5ca1d85 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -284,21 +284,31 @@
If the sample service jar becomes available, we can use it directly -->
<id>get-olingo2-sample</id>
<activation>
- <file>
- <missing>${basedir}/target/olingo2-my-car-service</missing>
- </file>
- <!-- the above condition is evaluated prior to the mvn execution and consequently
- it evaluates to false when "mvn clean install" is invoked while the folder exists,
- which is correct, yet unfortunate, as the clean phase will remove the folder and
- subsequently the source folder is not created.
- So, we need activate this profle by default and set -fn option to the mvn below to
- ignore the duplicate error ;-((
- -->
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>clean-olingo2-sample</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
+ <filesets>
+ <fileset>
+ <directory>${project.build.directory}/olingo2-my-car-service</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>${gmavenplus-plugin-version}</version>
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.
[camel] 03/03: CAMEL-11930: pipeline e-mail support
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 11842f545e63124ce14f187de7cc232da3d58905
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Feb 19 12:33:37 2018 +0100
CAMEL-11930: pipeline e-mail support
Pipeline build should now send e-mail notifications.
---
Jenkinsfile | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 03a61ba..7632ac3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -72,5 +72,16 @@ pipeline {
}
}
}
+
+ post {
+ always {
+ emailext(
+ subject: '${DEFAULT_SUBJECT}',
+ to: 'zoran+cameldev@regvart.com',
+ body: '${DEFAULT_CONTENT}',
+ recipientProviders: [[$class: 'CulpritsRecipientProvider']]
+ )
+ }
+ }
}
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.
[camel] 02/03: CAMEL-11930: don't fail if no JUnit results found
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 41b45689505dcd5437a3632bf27800b91aeaa104
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Mon Feb 19 12:35:26 2018 +0100
CAMEL-11930: don't fail if no JUnit results found
Allowed JUnit test result archiver to proceed even if no test reports
were created (i.e. if no modules have been changed and they were all
skipped).
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 755467f..03a61ba 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,8 +60,8 @@ pipeline {
}
post {
always {
- junit '**/target/surefire-reports/*.xml'
- junit '**/target/failsafe-reports/*.xml'
+ junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
+ junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
}
}
}
--
To stop receiving notification emails like this one, please contact
zregvart@apache.org.