This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 1edbe775db Add all tests again after checking Jenkins, fixes #2548
(#3879)
1edbe775db is described below
commit 1edbe775db0470d3780118572ae26b41cc798dbc
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Fri Apr 26 17:27:06 2024 +0200
Add all tests again after checking Jenkins, fixes #2548 (#3879)
---
Jenkinsfile.daily | 22 +++++++++++-----------
integration-tests/scripts/run-tests-docker.sh | 6 +++---
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index 15ed9cc762..3198d25070 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -85,17 +85,17 @@ pipeline {
sh "mvn $MAVEN_PARAMS clean install"
}
}
- // stage('Code Quality') {
- // tools{
- // jdk 'jdk_17_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_hop -Dsonar.branch.name=${BRANCH_NAME}
-Dsonar.login=${SONAR_TOKEN}'
- // }
- // }
- // }
+ stage('Code Quality') {
+ tools{
+ jdk 'jdk_17_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_hop
-Dsonar.branch.name=${BRANCH_NAME} -Dsonar.token=${SONAR_TOKEN}'
+ }
+ }
+ }
stage('Create Docker image & Run Tests'){
steps {
sh 'cp $GCP_CREDS google-key-apache-hop-it.json'
diff --git a/integration-tests/scripts/run-tests-docker.sh
b/integration-tests/scripts/run-tests-docker.sh
index 9a8f843e77..b0e81aa536 100755
--- a/integration-tests/scripts/run-tests-docker.sh
+++ b/integration-tests/scripts/run-tests-docker.sh
@@ -80,7 +80,7 @@ mkdir -p "${CURRENT_DIR}"/../surefire-reports/
unzip -o -q "${CURRENT_DIR}/../../assemblies/client/target/*.zip" -d
${CURRENT_DIR}/../../assemblies/client/target/
# Build base image only once
-#docker compose -f ${DOCKER_FILES_DIR}/integration-tests-base.yaml build
--build-arg JENKINS_USER=${JENKINS_USER} --build-arg JENKINS_UID=${JENKINS_UID}
--build-arg JENKINS_GROUP=${JENKINS_GROUP} --build-arg
JENKINS_GID=${JENKINS_GID} --build-arg GCP_KEY_FILE=${GCP_KEY_FILE}
+docker compose -f ${DOCKER_FILES_DIR}/integration-tests-base.yaml build
--build-arg JENKINS_USER=${JENKINS_USER} --build-arg JENKINS_UID=${JENKINS_UID}
--build-arg JENKINS_GROUP=${JENKINS_GROUP} --build-arg
JENKINS_GID=${JENKINS_GID} --build-arg GCP_KEY_FILE=${GCP_KEY_FILE}
# Loop over project folders
for d in "${CURRENT_DIR}"/../${PROJECT_NAME}/; do
@@ -101,10 +101,10 @@ for d in "${CURRENT_DIR}"/../${PROJECT_NAME}/; do
if [ -f "${DOCKER_FILES_DIR}/integration-tests-${PROJECT_NAME}.yaml" ];
then
echo "Project compose exists."
EXECUTED_COMPOSE_FILES=("${EXECUTED_COMPOSE_FILES[@]}"
"${DOCKER_FILES_DIR}/integration-tests-${PROJECT_NAME}.yaml")
- #PROJECT_NAME=${PROJECT_NAME} docker compose -f
${DOCKER_FILES_DIR}/integration-tests-${PROJECT_NAME}.yaml up
--abort-on-container-exit
+ PROJECT_NAME=${PROJECT_NAME} docker compose -f
${DOCKER_FILES_DIR}/integration-tests-${PROJECT_NAME}.yaml up
--abort-on-container-exit
else
echo "Project compose does not exists."
- #PROJECT_NAME=${PROJECT_NAME} docker compose -f
${DOCKER_FILES_DIR}/integration-tests-base.yaml up --abort-on-container-exit
+ PROJECT_NAME=${PROJECT_NAME} docker compose -f
${DOCKER_FILES_DIR}/integration-tests-base.yaml up --abort-on-container-exit
fi
fi
fi
