This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch integration-tests-v2
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/integration-tests-v2 by this
push:
new 1df852f HOP-2914: update docs and enable full build again
1df852f is described below
commit 1df852fe71669800496824964f1d8f1835c305bd
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Wed Jun 2 15:57:23 2021 +0200
HOP-2914: update docs and enable full build again
---
Jenkinsfile.daily | 24 +++++++++++-----------
.../modules/ROOT/pages/integration-testing.adoc | 21 +++++++------------
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 1de94da..f5e6692 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -81,20 +81,20 @@ pipeline {
stage('Build & Test') {
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'
+ }
+ 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') {
- // tools{
- // jdk 'jdk_11_latest'
- // }
- // 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'){
steps {
sh "integration-tests/scripts/run-tests-docker.sh
JENKINS_USER=${jenkins_user} JENKINS_UID=${jenkins_uid}
JENKINS_GROUP=${jenkins_group} JENKINS_GID=${jenkins_gid}"
diff --git a/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc
b/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc
index 22ad585..0b75463 100644
--- a/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc
+++ b/docs/hop-dev-manual/modules/ROOT/pages/integration-testing.adoc
@@ -85,19 +85,12 @@ mvn clean install
. Run the Docker Compose script
+
----
-docker-compose -f docker/integration-tests/docker-compose-ci.yaml up -d
-----
-+
-. Check the running container
-+
-----
-docker logs integration-tests_integration_test_1
-----
-+
-. Cleanup after run
-+
-----
-docker-compose -f docker/integration-tests/docker-compose-ci.yaml down --rmi
all
+cd integration-tests/scripts
+./run-tests-docker.sh
+
+# Optionally you can run a single project by adding the PROJECT_NAME variable
to the script
+
+./run-tests-docker.sh PROJECT_NAME=database
----
+
. Surefire Reports
@@ -108,7 +101,7 @@ We generate xml reports that can be used by Jenkins to
generate reports. these r
A script is also provided to run the test without using Docker. This script is
also used inside the automated test suite but can be used in a stand alone mode.
-This script can be found at following location
`incubator-hop/integration-tests/scripts/run-tests.sh`. Be sure to export the
needed system variables for the script to find the correct paths to run the
tests.
+This script can be found at following location
`incubator-hop/integration-tests/scripts/run-tests.sh`. Be sure to export the
needed system variables for the script to find the correct paths to run the
tests. You can aslo run a single project by adding the project name to the
command `./run-tests.sh projectname`
== Special checks
