You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/12/06 15:24:42 UTC
[incubator-hop] branch integration-tests updated (ebc6139 ->
a4af14a)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a change to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git.
from ebc6139 HOP-2122
add 8b80962 HOP-2267 : Beam complaining about slf4j
add cfb5377 HOP-2266 : Beam generating unbounded synthetic data too fast
add 7ebf4f7 HOP-2261 : Partition schema editor: doesn't pick up number of partitions
add 9aadba7 Merge pull request #437 from mattcasters/master
add b33eeb5 HOP-2212 (#438)
new 3f0bcca HOP-2212 (#436)
new 533947f HOP-2212
new 50647e2 HOP=2212
new 7d6c50a HOP-2212
new 7178e6f HOP-2212
new fed3676 HOP-2212
new 657dff4 HOP-2212
new 9a15298 HOP-2122
new adedffe HOP-2122
new 4086a1e HOP-2122
new 8fa7ddd HOP-2122
new 9c824fa HOP-2122
new adc193b HOP-2122
new 34e191f HOP-2122
new 02e92bf HOP-2122
new 29b282a HOP-2122
new 918caa7 HOP-2122
new e610192 HOP-2122
new adaff4f HOP-2122
new 30ead66 HOP-2122
new d1f5876 HOP-2122
new a4af14a Merge remote-tracking branch 'upstream/integration-tests' into integration-tests
The 22 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:
.../plugins/engines/beam/src/assembly/assembly.xml | 2 -
.../org/apache/hop/partition/PartitionSchema.java | 2 +-
.../org/apache/hop/pipeline/PipelinePainter.java | 1049 ++++++++++++--------
.../hop/pipeline/transform/BaseTransform.java | 1 +
integration-tests/{HOP-2212 => BI-2212}/main.hpl | 0
.../metadata/pipeline-run-configuration/local.json | 0
.../metadata/workflow-run-configuration/local.json | 0
.../{HOP-2212 => BI-2212}/project-config.json | 0
.../handler/BeamRowGeneratorTransformHandler.java | 184 ++--
.../hop/ui/partition/PartitionSchemaEditor.java | 39 +-
.../partition/messages/messages_en_US.properties | 4 +-
11 files changed, 756 insertions(+), 525 deletions(-)
copy integration-tests/{HOP-2212 => BI-2212}/main.hpl (100%)
copy integration-tests/{HOP-2212 => BI-2212}/metadata/pipeline-run-configuration/local.json (100%)
copy {plugins/transforms/mapping/src/main/resources/it => integration-tests/BI-2212}/metadata/workflow-run-configuration/local.json (100%)
copy integration-tests/{HOP-2212 => BI-2212}/project-config.json (100%)
[incubator-hop] 11/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 8fa7ddda699d4f0e0c3a29a918d9ff218da7b1f2
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 00:38:59 2020 +0100
HOP-2122
---
Jenkinsfile | 8 --------
Jenkinsfile.daily | 33 +++++++++++++++++++++++----------
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9067b1c..5bf2ce5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -98,14 +98,6 @@ pipeline {
}
}
}
- stage('Code Quality') {
- steps {
- echo 'Checking Code Quality on SonarCloud'
- withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
- sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
- }
- }
- }
stage('Deploy'){
when {
branch 'master'
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 5aac61c..b7460ce 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -29,6 +29,10 @@ pipeline {
label AGENT_LABEL
}
+ triggers {
+ cron('H H(2-7) * * *')
+ }
+
tools {
jdk JDK_NAME
maven MAVEN_NAME
@@ -76,22 +80,28 @@ pipeline {
}
steps {
echo 'Build & Test'
- sh "mvn $MAVEN_PARAMS clean install -DskipTests=true"
+ sh "mvn $MAVEN_PARAMS clean install"
+ }
+ }
+ stage('Code Quality') {
+ when {
+ branch 'integration-tests'
+ }
+ steps {
+ echo 'Checking Code Quality on SonarCloud'
+ withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
+ sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+ }
}
}
- // stage('Code Quality') {
- // steps {
- // echo 'Checking Code Quality on SonarCloud'
- // withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
- // sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
- // }
- // }
- // }
stage('Create Docker image & Run Tests'){
+ when {
+ branch 'integration-tests'
+ }
steps {
script {
dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests .")
- dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
+ dockerImage.inside("-v $WORKSPACE/integration-tests:/files -u hop:hop"){
echo 'Run tests'
sh 'ls /files'
sh 'cd /files/scripts && ./run-tests.sh'
@@ -105,6 +115,9 @@ pipeline {
}
}
stage('Remove docker image'){
+ when {
+ branch 'integration-tests'
+ }
steps {
sh "docker rmi $imagename:latest"
}
[incubator-hop] 16/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 29b282a72ca2337c5bb1f2d58a47792ba9fd33b6
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 10:10:00 2020 +0100
HOP-2122
---
Jenkinsfile.daily | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index c35044a..d6bf3dc 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -42,7 +42,7 @@ pipeline {
MAVEN_SKIP_RC = true
dockerImage = ''
imagename = 'hop'
- jenkins_user = ${USER}
+ jenkins_user = "${USER}"
jenkins_uid = sh(script: "id -u ${USER}", returnStdout: true).trim()
jenkins_gid = sh(script: "id -g ${USER}", returnStdout: true).trim()
jenkins_group = sh(script: "id -gn ${USER}", returnStdout: true).trim()
[incubator-hop] 06/22: HOP-2212
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit fed3676d20344d1aed467b3b202bd3b98b70e9fe
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 23:08:43 2020 +0100
HOP-2212
---
Jenkinsfile.daily | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 42cc198..35fa9a8 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -95,9 +95,16 @@ pipeline {
}
}
stage('Run Integration Tests'){
+ agent {
+ docker {
+ image 'hop:latest'
+ args "-v $WORKSPACE/integration-tests:/files"
+ }
+ }
steps {
script {
echo 'Run tests'
+ echo 'ls /files'
}
}
post {
@@ -108,7 +115,6 @@ pipeline {
}
stage('Remove docker image'){
steps {
- sh "docker rmi $imagename:$BUILD_NUMBER"
sh "docker rmi $imagename:latest"
}
}
[incubator-hop] 17/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 918caa726820685b94d02d2f2129500b1a6391c5
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 10:13:17 2020 +0100
HOP-2122
---
Jenkinsfile.daily | 56 +++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index d6bf3dc..3e7cea3 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -102,34 +102,34 @@ pipeline {
// }
// }
// }
- // stage('Create Docker image & Run Tests'){
- // when {
- // branch 'integration-tests'
- // }
- // steps {
- // script {
- // dockerImage = docker.build(imagename, "--build-arg JENKINS_USER=$(JENKINS_USER) --build-arg JENKINS_UID=$(JENKINS_UID) --build-arg JENKINS_GROUP=$(JENKINS_GROUP) --build-arg JENKINS_GID=$(JENKINS_GID) -f Dockerfile.unit-tests .")
- // dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
- // echo 'Run tests'
- // sh 'ls /files'
- // sh 'cd /files/scripts && ./run-tests.sh'
- // }
- // }
- // }
- // post {
- // always {
- // junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
- // }
- // }
- // }
- // stage('Remove docker image'){
- // when {
- // branch 'integration-tests'
- // }
- // steps {
- // sh "docker rmi $imagename:latest"
- // }
- // }
+ stage('Create Docker image & Run Tests'){
+ when {
+ branch 'integration-tests'
+ }
+ steps {
+ script {
+ dockerImage = docker.build(imagename, "--build-arg JENKINS_USER=${jenkins_user} --build-arg JENKINS_UID=${jenkins_uid} --build-arg JENKINS_GROUP=${jenkins_group} --build-arg JENKINS_GID=${jenkins_gid} -f Dockerfile.unit-tests .")
+ dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
+ echo 'Run tests'
+ sh 'ls /files'
+ sh 'cd /files/scripts && ./run-tests.sh'
+ }
+ }
+ }
+ post {
+ always {
+ junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
+ }
+ }
+ }
+ stage('Remove docker image'){
+ when {
+ branch 'integration-tests'
+ }
+ steps {
+ sh "docker rmi $imagename:latest"
+ }
+ }
}
[incubator-hop] 05/22: HOP-2212
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 7178e6fb205e4fcd5348cb458333a85fe10cd0de
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 22:54:24 2020 +0100
HOP-2212
---
Jenkinsfile.daily | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 0687bcb..42cc198 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -76,7 +76,7 @@ pipeline {
}
steps {
echo 'Build & Test'
- sh "mvn $MAVEN_PARAMS clean install"
+ sh "mvn $MAVEN_PARAMS clean install -DskipTests=true"
}
}
// stage('Code Quality') {
@@ -102,15 +102,14 @@ pipeline {
}
post {
always {
- junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
- junit(testResults: '**/failsafe-reports/*.xml', allowEmptyResults: true)
+ junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
}
}
}
stage('Remove docker image'){
steps {
- sh "docker rmi $iamgename:$BUILD_NUMBER"
- sh "docker rmi $iamgename:latest"
+ sh "docker rmi $imagename:$BUILD_NUMBER"
+ sh "docker rmi $imagename:latest"
}
}
[incubator-hop] 10/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 4086a1ea695d169ed0087b4ae0380d216695bb74
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 00:19:07 2020 +0100
HOP-2122
---
.gitignore | 2 +-
Jenkinsfile.daily | 22 ++--------------------
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4acc473..82131e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,4 @@ Workflow Run Configuration/
Hop Server/
Relational Database Connection/
\.temp-beam-*/
-
+integration-tests/surefire-reports
\ No newline at end of file
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index fcc5a04..5aac61c 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -93,7 +93,8 @@ pipeline {
dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests .")
dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
echo 'Run tests'
- echo 'ls /files'
+ sh 'ls /files'
+ sh 'cd /files/scripts && ./run-tests.sh'
}
}
}
@@ -103,25 +104,6 @@ pipeline {
}
}
}
- // stage('Run Integration Tests'){
- // agent {
- // docker {
- // image 'hop:latest'
- // args "-v $WORKSPACE/integration-tests:/files"
- // }
- // }
- // steps {
- // script {
- // echo 'Run tests'
- // echo 'ls /files'
- // }
- // }
- // post {
- // always {
- // junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
- // }
- // }
- // }
stage('Remove docker image'){
steps {
sh "docker rmi $imagename:latest"
[incubator-hop] 04/22: HOP-2212
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 7d6c50a9d8331d6ed47c7010da35fe8796e1e65a
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 21:14:08 2020 +0100
HOP-2212
---
Jenkinsfile.daily | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 04579c8..0687bcb 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -108,8 +108,10 @@ pipeline {
}
}
stage('Remove docker image'){
- sh "docker rmi $iamgename:$BUILD_NUMBER"
- sh "docker rmi $iamgename:latest"
+ steps {
+ sh "docker rmi $iamgename:$BUILD_NUMBER"
+ sh "docker rmi $iamgename:latest"
+ }
}
[incubator-hop] 09/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit adedffe8ecac32c8da1fc8e05797db850fc0f4a7
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 23:58:49 2020 +0100
HOP-2122
---
Dockerfile.unit-tests | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile.unit-tests b/Dockerfile.unit-tests
index e769812..83c2f2d 100644
--- a/Dockerfile.unit-tests
+++ b/Dockerfile.unit-tests
@@ -39,4 +39,4 @@ USER hop
ENV PATH=$PATH:${DEPLOYMENT_PATH}/hop
WORKDIR /home/hop
# CMD ["/bin/bash"]
-ENTRYPOINT ["/bin/bash"]
\ No newline at end of file
+ENTRYPOINT []
\ No newline at end of file
[incubator-hop] 20/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 30ead660f37934195a439651820c9ca13f223714
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 13:40:03 2020 +0100
HOP-2122
change sonar to jdk 11 and run full flow
---
Jenkinsfile.daily | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 3d625ef..6620623 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -88,20 +88,23 @@ pipeline {
}
steps {
echo 'Build & Test'
- sh "mvn $MAVEN_PARAMS clean install -DskipTests=true"
+ sh "mvn $MAVEN_PARAMS clean install"
+ }
+ }
+ stage('Code Quality') {
+ tools{
+ jdk 'jdk_11_latest'
+ }
+ when {
+ branch 'integration-tests'
+ }
+ steps {
+ echo 'Checking Code Quality on SonarCloud'
+ withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
+ sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+ }
}
}
- // stage('Code Quality') {
- // when {
- // branch 'integration-tests'
- // }
- // steps {
- // echo 'Checking Code Quality on SonarCloud'
- // withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
- // sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
- // }
- // }
- // }
stage('Create Docker image & Run Tests'){
when {
branch 'integration-tests'
@@ -128,9 +131,7 @@ pipeline {
steps {
sh "docker rmi $imagename:latest"
}
- }
-
-
+ }
}
post {
always {
[incubator-hop] 22/22: Merge remote-tracking branch
'upstream/integration-tests' into integration-tests
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit a4af14ae4a2510bd4cf625f4d203a33079a7eb76
Merge: d1f5876 ebc6139
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 16:24:31 2020 +0100
Merge remote-tracking branch 'upstream/integration-tests' into integration-tests
[incubator-hop] 19/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit adaff4fed7f245684aed887b0c104308b00a5653
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 13:05:37 2020 +0100
HOP-2122
set HOP_JAVA_HOME in container
---
Dockerfile.unit-tests | 2 ++
Jenkinsfile.daily | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile.unit-tests b/Dockerfile.unit-tests
index 8d9235e..2cb1f1a 100644
--- a/Dockerfile.unit-tests
+++ b/Dockerfile.unit-tests
@@ -43,6 +43,8 @@ RUN unzip ${DEPLOYMENT_PATH}/hop.zip -d ${DEPLOYMENT_PATH} \
VOLUME ["/files"]
USER ${JENKINS_USER}
ENV PATH=$PATH:${DEPLOYMENT_PATH}/hop
+#SET HOP_JAVA_HOME
+ENV HOP_JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
WORKDIR /home/${JENKINS_USER}
# CMD ["/bin/bash"]
ENTRYPOINT []
\ No newline at end of file
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index afb12d9..3d625ef 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -111,7 +111,6 @@ pipeline {
dockerImage = docker.build(imagename, "--build-arg JENKINS_USER=${jenkins_user} --build-arg JENKINS_UID=${jenkins_uid} --build-arg JENKINS_GROUP=${jenkins_group} --build-arg JENKINS_GID=${jenkins_gid} -f Dockerfile.unit-tests .")
dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
echo 'Run tests'
- sh 'export HOP_JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk'
sh 'cd /files/scripts && ./run-tests.sh'
}
}
[incubator-hop] 15/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 02e92bf6f87ba3d3eb877fb9ee70e57e7a191630
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 10:09:13 2020 +0100
HOP-2122
---
Jenkinsfile.daily | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index a844508..c35044a 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -42,7 +42,10 @@ pipeline {
MAVEN_SKIP_RC = true
dockerImage = ''
imagename = 'hop'
- jenkins_user = $(JENKINS_USER)
+ jenkins_user = ${USER}
+ jenkins_uid = sh(script: "id -u ${USER}", returnStdout: true).trim()
+ jenkins_gid = sh(script: "id -g ${USER}", returnStdout: true).trim()
+ jenkins_group = sh(script: "id -gn ${USER}", returnStdout: true).trim()
}
options {
@@ -62,6 +65,9 @@ pipeline {
echo 'Building Branch: ' + env.BRANCH_NAME
echo 'Using PATH = ' + env.PATH
echo 'Using Jenkins user = ' + jenkins_user
+ echo 'Using Jenkins userid = ' + jenkins_uid
+ echo 'Using Jenkins group = ' + jenkins_group
+ echo 'Using Jenkins groupid = ' + jenkins_gid
}
}
stage('Cleanup') {
[incubator-hop] 01/22: HOP-2212 (#436)
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 3f0bcca9e8245b3a4c4954381c94a2f783c51032
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 15:51:05 2020 +0100
HOP-2212 (#436)
* add initial integration tests to hop
* HOP-2212
---
Jenkinsfile.daily | 43 +++++++++++-----------------------
integration-tests/scripts/run-tests.sh | 10 +++-----
2 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index cce1854..6f47d31 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -36,8 +36,6 @@ pipeline {
environment {
MAVEN_SKIP_RC = true
- dockerImage = ''
- imagename = 'hop'
}
options {
@@ -70,36 +68,19 @@ pipeline {
checkout scm
}
}
- stage('Build & Test') {
+ stage('Build') {
when {
branch 'integration-tests'
}
steps {
- echo 'Build & Test'
- sh "mvn $MAVEN_PARAMS clean install"
- }
- }
- // stage('Code Quality') {
- // steps {
- // echo 'Checking Code Quality on SonarCloud'
- // withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
- // sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
- // }
- // }
- // }
- stage('Create Docker image'){
- steps {
- script {
- dockerImage = docker.build -f 'Dockerfile.unit-tests' imagename
+ echo 'Build'
+
+ dir("local-snapshots-dir/") {
+ deleteDir()
}
+
+ sh "mvn $MAVEN_PARAMS clean install"
}
- }
- stage('Run Integration Tests'){
- steps {
- script {
- echo 'Run tests'
- }
- }
post {
always {
junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
@@ -107,9 +88,13 @@ pipeline {
}
}
}
- stage('Remove docker image'){
- sh "docker rmi $iamgename:$BUILD_NUMBER"
- sh "docker rmi $iamgename:latest"
+ stage('Code Quality') {
+ steps {
+ echo 'Checking Code Quality on SonarCloud'
+ withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
+ sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+ }
+ }
}
diff --git a/integration-tests/scripts/run-tests.sh b/integration-tests/scripts/run-tests.sh
index c584214..28df867 100755
--- a/integration-tests/scripts/run-tests.sh
+++ b/integration-tests/scripts/run-tests.sh
@@ -1,7 +1,5 @@
#!/bin/bash
-current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
if [ -z "${HOP_LOCATION}" ]; then
HOP_LOCATION=/opt/hop
fi
@@ -14,8 +12,10 @@ skipped_counter=0
failures_counter=0
spacer="==========================================="
+#cleanup surefire report
+/dev/null > /tmp/testcases
-for d in $current_dir/../*/ ; do
+for d in ../*/ ; do
if [[ "$d" != *"scripts/" ]]; then
test_name=$(basename $d)
@@ -98,7 +98,3 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >> /tmp/surefire_report.xml
echo "<testsuite xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd\" version=\"3.0\" name=\"Hop Integration Tests\" time=\"$total_duration\" tests=\"$test_counter\" errors=\"$errors_counter\" skipped=\"$skipped_counter\" failures=\"$failures_counter\">" >> /tmp/surefire_report.xml
cat /tmp/testcases >> /tmp/surefire_report.xml
echo "</testsuite>" >> /tmp/surefire_report.xml
-
-#Copy final report back
-mkdir -p $current_dir/../surefire-reports/
-cp /tmp/surefire_report.xml $current_dir/../surefire-reports/report.xml
[incubator-hop] 07/22: HOP-2212
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 657dff433a1fe481acf239fca9459d76f4fc27f7
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 23:26:43 2020 +0100
HOP-2212
---
Jenkinsfile.daily | 39 ++++++++++++++++++++++++---------------
1 file changed, 24 insertions(+), 15 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 35fa9a8..fcc5a04 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -87,32 +87,41 @@ pipeline {
// }
// }
// }
- stage('Create Docker image'){
+ stage('Create Docker image & Run Tests'){
steps {
script {
dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests .")
- }
- }
- }
- stage('Run Integration Tests'){
- agent {
- docker {
- image 'hop:latest'
- args "-v $WORKSPACE/integration-tests:/files"
+ dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
+ echo 'Run tests'
+ echo 'ls /files'
}
- }
- steps {
- script {
- echo 'Run tests'
- echo 'ls /files'
}
- }
+ }
post {
always {
junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
}
}
}
+ // stage('Run Integration Tests'){
+ // agent {
+ // docker {
+ // image 'hop:latest'
+ // args "-v $WORKSPACE/integration-tests:/files"
+ // }
+ // }
+ // steps {
+ // script {
+ // echo 'Run tests'
+ // echo 'ls /files'
+ // }
+ // }
+ // post {
+ // always {
+ // junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
+ // }
+ // }
+ // }
stage('Remove docker image'){
steps {
sh "docker rmi $imagename:latest"
[incubator-hop] 02/22: HOP-2212
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 533947ff0ca1f332cefa792aae9b1298fc6aa8c0
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 21:09:09 2020 +0100
HOP-2212
---
Jenkinsfile.daily | 43 +++++++++++++++++++++++-----------
integration-tests/scripts/run-tests.sh | 10 +++++---
2 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 6f47d31..cce1854 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -36,6 +36,8 @@ pipeline {
environment {
MAVEN_SKIP_RC = true
+ dockerImage = ''
+ imagename = 'hop'
}
options {
@@ -68,19 +70,36 @@ pipeline {
checkout scm
}
}
- stage('Build') {
+ stage('Build & Test') {
when {
branch 'integration-tests'
}
steps {
- echo 'Build'
-
- dir("local-snapshots-dir/") {
- deleteDir()
- }
-
+ echo 'Build & Test'
sh "mvn $MAVEN_PARAMS clean install"
}
+ }
+ // stage('Code Quality') {
+ // steps {
+ // echo 'Checking Code Quality on SonarCloud'
+ // withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
+ // sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+ // }
+ // }
+ // }
+ stage('Create Docker image'){
+ steps {
+ script {
+ dockerImage = docker.build -f 'Dockerfile.unit-tests' imagename
+ }
+ }
+ }
+ stage('Run Integration Tests'){
+ steps {
+ script {
+ echo 'Run tests'
+ }
+ }
post {
always {
junit(testResults: '**/surefire-reports/*.xml', allowEmptyResults: true)
@@ -88,13 +107,9 @@ pipeline {
}
}
}
- stage('Code Quality') {
- steps {
- echo 'Checking Code Quality on SonarCloud'
- withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
- sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
- }
- }
+ stage('Remove docker image'){
+ sh "docker rmi $iamgename:$BUILD_NUMBER"
+ sh "docker rmi $iamgename:latest"
}
diff --git a/integration-tests/scripts/run-tests.sh b/integration-tests/scripts/run-tests.sh
index 28df867..c584214 100755
--- a/integration-tests/scripts/run-tests.sh
+++ b/integration-tests/scripts/run-tests.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
if [ -z "${HOP_LOCATION}" ]; then
HOP_LOCATION=/opt/hop
fi
@@ -12,10 +14,8 @@ skipped_counter=0
failures_counter=0
spacer="==========================================="
-#cleanup surefire report
-/dev/null > /tmp/testcases
-for d in ../*/ ; do
+for d in $current_dir/../*/ ; do
if [[ "$d" != *"scripts/" ]]; then
test_name=$(basename $d)
@@ -98,3 +98,7 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >> /tmp/surefire_report.xml
echo "<testsuite xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd\" version=\"3.0\" name=\"Hop Integration Tests\" time=\"$total_duration\" tests=\"$test_counter\" errors=\"$errors_counter\" skipped=\"$skipped_counter\" failures=\"$failures_counter\">" >> /tmp/surefire_report.xml
cat /tmp/testcases >> /tmp/surefire_report.xml
echo "</testsuite>" >> /tmp/surefire_report.xml
+
+#Copy final report back
+mkdir -p $current_dir/../surefire-reports/
+cp /tmp/surefire_report.xml $current_dir/../surefire-reports/report.xml
[incubator-hop] 13/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit adc193b586909f2365a07d357f3f28bd0d4b5dfd
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 09:49:37 2020 +0100
HOP-2122
---
Jenkinsfile.daily | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index e573140..0cadf16 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -100,7 +100,7 @@ pipeline {
}
steps {
script {
- dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests -build-arg JENKINS_USER=$(JENKINS_USER) --build-arg JENKINS_UID=$(JENKINS_UID) --build-arg JENKINS_GROUP=$(JENKINS_GROUP) --build-arg JENKINS_GID=$(JENKINS_GID) .")
+ dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests --build-arg JENKINS_USER=$(JENKINS_USER) --build-arg JENKINS_UID=$(JENKINS_UID) --build-arg JENKINS_GROUP=$(JENKINS_GROUP) --build-arg JENKINS_GID=$(JENKINS_GID) .")
dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
echo 'Run tests'
sh 'ls /files'
[incubator-hop] 12/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 9c824fad363eb40f01f550db27994cc8697e84bb
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 09:45:04 2020 +0100
HOP-2122
---
Dockerfile.unit-tests | 20 +++++++++++++-------
Jenkinsfile.daily | 28 ++++++++++++++--------------
2 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/Dockerfile.unit-tests b/Dockerfile.unit-tests
index 83c2f2d..72be821 100644
--- a/Dockerfile.unit-tests
+++ b/Dockerfile.unit-tests
@@ -8,6 +8,11 @@ ENV BRANCH_NAME=$BRANCH_NAME
ENV DEPLOYMENT_PATH=/opt
# volume mount point
ENV VOLUME_MOUNT_POINT=/files
+#Jenkins user an group
+ENV JENKINS_USER=hop
+ENV JENKINS_GROUP=hop
+ENV JENKINS_UID=1000
+ENV JENKINS_GID=1000
# any JRE settings you want to pass on
# The “-XX:+AggressiveHeap” tells the container to use all memory assigned to the container.
@@ -21,22 +26,23 @@ RUN apk update \
&& apk add --no-cache bash curl procps \
&& rm -rf /var/cache/apk/* \
&& mkdir ${VOLUME_MOUNT_POINT} \
- && adduser -D -s /bin/bash -h /home/hop hop \
- && chown hop:hop ${DEPLOYMENT_PATH} \
- && chown hop:hop ${VOLUME_MOUNT_POINT}
+ && addgroup -g ${JENKINS_GID} ${JENKINS_GROUP} \
+ && adduser -D -s /bin/bash -h /home/${JENKINS_USER} --uid ${JENKINS_UID} --ingroup ${JENKINS_GROUP} ${JENKINS_USER} \
+ && chown ${JENKINS_USER}:${JENKINS_GROUP} ${DEPLOYMENT_PATH} \
+ && chown ${JENKINS_USER}:${JENKINS_GROUP} ${VOLUME_MOUNT_POINT}
# copy the hop package from the local resources folder to the container image directory
-COPY --chown=hop:hop ./assemblies/client/target/hop-* ${DEPLOYMENT_PATH}/hop.zip
+COPY --chown=${JENKINS_USER}:${JENKINS_GROUP} ./assemblies/client/target/hop-* ${DEPLOYMENT_PATH}/hop.zip
RUN unzip ${DEPLOYMENT_PATH}/hop.zip -d ${DEPLOYMENT_PATH} \
&& rm ${DEPLOYMENT_PATH}/hop.zip \
- && chown -R hop:hop ${DEPLOYMENT_PATH}/hop \
+ && chown -R ${JENKINS_USER}:${JENKINS_GROUP} ${DEPLOYMENT_PATH}/hop \
&& chmod 700 ${DEPLOYMENT_PATH}/hop/*.sh
# make volume available so that hop pipeline and workflow files can be provided easily
VOLUME ["/files"]
-USER hop
+USER ${JENKINS_USER}
ENV PATH=$PATH:${DEPLOYMENT_PATH}/hop
-WORKDIR /home/hop
+WORKDIR /home/${JENKINS_USER}
# CMD ["/bin/bash"]
ENTRYPOINT []
\ No newline at end of file
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index b7460ce..e573140 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -80,28 +80,28 @@ pipeline {
}
steps {
echo 'Build & Test'
- sh "mvn $MAVEN_PARAMS clean install"
- }
- }
- stage('Code Quality') {
- when {
- branch 'integration-tests'
- }
- steps {
- echo 'Checking Code Quality on SonarCloud'
- withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
- sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
- }
+ sh "mvn $MAVEN_PARAMS clean install -DskipTests=true"
}
}
+ // stage('Code Quality') {
+ // when {
+ // branch 'integration-tests'
+ // }
+ // steps {
+ // echo 'Checking Code Quality on SonarCloud'
+ // withCredentials([string(credentialsId: 'sonarcloud-key-apache-hop', variable: 'SONAR_TOKEN')]) {
+ // sh 'mvn sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_incubator-hop -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.login=${SONAR_TOKEN}'
+ // }
+ // }
+ // }
stage('Create Docker image & Run Tests'){
when {
branch 'integration-tests'
}
steps {
script {
- dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests .")
- dockerImage.inside("-v $WORKSPACE/integration-tests:/files -u hop:hop"){
+ dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests -build-arg JENKINS_USER=$(JENKINS_USER) --build-arg JENKINS_UID=$(JENKINS_UID) --build-arg JENKINS_GROUP=$(JENKINS_GROUP) --build-arg JENKINS_GID=$(JENKINS_GID) .")
+ dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
echo 'Run tests'
sh 'ls /files'
sh 'cd /files/scripts && ./run-tests.sh'
[incubator-hop] 03/22: HOP=2212
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 50647e265bfe8f11b0364984fe1da7afb506eda7
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 21:12:40 2020 +0100
HOP=2212
---
Jenkinsfile.daily | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index cce1854..04579c8 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -90,7 +90,7 @@ pipeline {
stage('Create Docker image'){
steps {
script {
- dockerImage = docker.build -f 'Dockerfile.unit-tests' imagename
+ dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests .")
}
}
}
[incubator-hop] 18/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit e610192ed4674f4555c7b9d5fb2ca7ce5ebe64b8
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 12:00:22 2020 +0100
HOP-2122
set HOP_JAVA_HOME in container
---
Jenkinsfile.daily | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 3e7cea3..afb12d9 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -111,7 +111,7 @@ pipeline {
dockerImage = docker.build(imagename, "--build-arg JENKINS_USER=${jenkins_user} --build-arg JENKINS_UID=${jenkins_uid} --build-arg JENKINS_GROUP=${jenkins_group} --build-arg JENKINS_GID=${jenkins_gid} -f Dockerfile.unit-tests .")
dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
echo 'Run tests'
- sh 'ls /files'
+ sh 'export HOP_JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk'
sh 'cd /files/scripts && ./run-tests.sh'
}
}
[incubator-hop] 14/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 34e191fa35aab0f65af5968e866e134e74e20f2a
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 10:01:19 2020 +0100
HOP-2122
---
Dockerfile.unit-tests | 8 +++----
Jenkinsfile.daily | 58 ++++++++++++++++++++++++++-------------------------
2 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/Dockerfile.unit-tests b/Dockerfile.unit-tests
index 72be821..8d9235e 100644
--- a/Dockerfile.unit-tests
+++ b/Dockerfile.unit-tests
@@ -9,10 +9,10 @@ ENV DEPLOYMENT_PATH=/opt
# volume mount point
ENV VOLUME_MOUNT_POINT=/files
#Jenkins user an group
-ENV JENKINS_USER=hop
-ENV JENKINS_GROUP=hop
-ENV JENKINS_UID=1000
-ENV JENKINS_GID=1000
+ARG JENKINS_USER=hop
+ARG JENKINS_GROUP=hop
+ARG JENKINS_UID=1000
+ARG JENKINS_GID=1000
# any JRE settings you want to pass on
# The “-XX:+AggressiveHeap” tells the container to use all memory assigned to the container.
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 0cadf16..a844508 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -42,6 +42,7 @@ pipeline {
MAVEN_SKIP_RC = true
dockerImage = ''
imagename = 'hop'
+ jenkins_user = $(JENKINS_USER)
}
options {
@@ -60,6 +61,7 @@ pipeline {
steps {
echo 'Building Branch: ' + env.BRANCH_NAME
echo 'Using PATH = ' + env.PATH
+ echo 'Using Jenkins user = ' + jenkins_user
}
}
stage('Cleanup') {
@@ -94,34 +96,34 @@ pipeline {
// }
// }
// }
- stage('Create Docker image & Run Tests'){
- when {
- branch 'integration-tests'
- }
- steps {
- script {
- dockerImage = docker.build(imagename, "-f Dockerfile.unit-tests --build-arg JENKINS_USER=$(JENKINS_USER) --build-arg JENKINS_UID=$(JENKINS_UID) --build-arg JENKINS_GROUP=$(JENKINS_GROUP) --build-arg JENKINS_GID=$(JENKINS_GID) .")
- dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
- echo 'Run tests'
- sh 'ls /files'
- sh 'cd /files/scripts && ./run-tests.sh'
- }
- }
- }
- post {
- always {
- junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
- }
- }
- }
- stage('Remove docker image'){
- when {
- branch 'integration-tests'
- }
- steps {
- sh "docker rmi $imagename:latest"
- }
- }
+ // stage('Create Docker image & Run Tests'){
+ // when {
+ // branch 'integration-tests'
+ // }
+ // steps {
+ // script {
+ // dockerImage = docker.build(imagename, "--build-arg JENKINS_USER=$(JENKINS_USER) --build-arg JENKINS_UID=$(JENKINS_UID) --build-arg JENKINS_GROUP=$(JENKINS_GROUP) --build-arg JENKINS_GID=$(JENKINS_GID) -f Dockerfile.unit-tests .")
+ // dockerImage.inside("-v $WORKSPACE/integration-tests:/files"){
+ // echo 'Run tests'
+ // sh 'ls /files'
+ // sh 'cd /files/scripts && ./run-tests.sh'
+ // }
+ // }
+ // }
+ // post {
+ // always {
+ // junit(testResults: 'integration-tests/**/surefire-reports/*.xml', allowEmptyResults: true)
+ // }
+ // }
+ // }
+ // stage('Remove docker image'){
+ // when {
+ // branch 'integration-tests'
+ // }
+ // steps {
+ // sh "docker rmi $imagename:latest"
+ // }
+ // }
}
[incubator-hop] 08/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit 9a15298bad038a933ac0889686de74d05cb1a6c2
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sat Dec 5 23:44:09 2020 +0100
HOP-2122
---
Dockerfile.unit-tests | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile.unit-tests b/Dockerfile.unit-tests
index 1704359..e769812 100644
--- a/Dockerfile.unit-tests
+++ b/Dockerfile.unit-tests
@@ -39,4 +39,4 @@ USER hop
ENV PATH=$PATH:${DEPLOYMENT_PATH}/hop
WORKDIR /home/hop
# CMD ["/bin/bash"]
-ENTRYPOINT ["/bin/bash", "/files/scripts/run-tests.sh"]
\ No newline at end of file
+ENTRYPOINT ["/bin/bash"]
\ No newline at end of file
[incubator-hop] 21/22: HOP-2122
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
commit d1f5876d97c778cd6db6698e4e0e90eab7f256a9
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Dec 6 16:20:01 2020 +0100
HOP-2122
switch to master branch
---
Jenkinsfile.daily | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 6620623..8abcdf7 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -84,7 +84,7 @@ pipeline {
}
stage('Build & Test') {
when {
- branch 'integration-tests'
+ branch 'master'
}
steps {
echo 'Build & Test'
@@ -96,7 +96,7 @@ pipeline {
jdk 'jdk_11_latest'
}
when {
- branch 'integration-tests'
+ branch 'master'
}
steps {
echo 'Checking Code Quality on SonarCloud'
@@ -107,7 +107,7 @@ pipeline {
}
stage('Create Docker image & Run Tests'){
when {
- branch 'integration-tests'
+ branch 'master'
}
steps {
script {
@@ -126,7 +126,7 @@ pipeline {
}
stage('Remove docker image'){
when {
- branch 'integration-tests'
+ branch 'master'
}
steps {
sh "docker rmi $imagename:latest"