This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 5cf815b HOP-2529: add hop web build and cleanup integration tests
new 9cf3da2 Merge pull request #656 from hansva/HOP-2529
5cf815b is described below
commit 5cf815b482d6b0431536a86b329a334026bef4f1
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Mon Mar 1 21:21:04 2021 +0100
HOP-2529: add hop web build and cleanup integration tests
---
Jenkinsfile | 24 +++++++++++++++++++---
docker/integration-tests/Dockerfile.unit-tests | 16 +++++++++++++++
...ain-0004-udjc-render-all-transforms-in-svg.hwf} | 0
...l_main-0005-udjc-render-all-actions-in-svg.hwf} | 0
integration-tests/scripts/run-tests.sh | 2 +-
5 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8dbf1bd..b941d72 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,6 +38,7 @@ pipeline {
MAVEN_SKIP_RC = true
BRANCH_NAME ='master'
DOCKER_REPO='docker.io/apache/incubator-hop'
+ DOCKER_REPO_WEB='docker.io/apache/incubator-hop-web'
}
options {
@@ -116,15 +117,17 @@ pipeline {
branch 'master'
}
steps{
- sh "cd assemblies/client/target/ && unzip hop-client-*.zip"
+ sh "unzip ./assemblies/client/target/hop-client-*.zip -d &&
./assemblies/client/target/"
+ sh "unzip ./assemblies/web/target/hop.war -d
./assemblies/web/target/webapp"
+ sh "unzip
./assemblies/plugins/dist/target/hop-assemblies-*.zip -d
./assemblies/plugins/dist/target/"
}
}
- stage('Build Docker Image') {
+ stage('Build Hop Docker Image') {
when {
branch 'master'
}
steps {
- echo 'Building Docker Image'
+ echo 'Building Hop Docker Image'
withDockerRegistry([ credentialsId: "dockerhub-hop", url: ""
]) {
//TODO We may never create final/latest version using
CI/CD as we need to follow manual apache release process with signing
@@ -134,6 +137,21 @@ pipeline {
}
}
}
+ stage('Build Hop Web Docker Image') {
+ when {
+ branch 'master'
+ }
+ steps {
+ echo 'Building Hop Web Docker Image'
+
+ withDockerRegistry([ credentialsId: "dockerhub-hop", url: ""
]) {
+ //TODO We may never create final/latest version using
CI/CD as we need to follow manual apache release process with signing
+ sh "docker build . -f docker/Dockerfile.web -t
${DOCKER_REPO_WEB}:${env.POM_VERSION}"
+ sh "docker push ${DOCKER_REPO_WEB}:${env.POM_VERSION}"
+ sh "docker rmi ${DOCKER_REPO_WEB}:${env.POM_VERSION}"
+ }
+ }
+ }
stage('Deploy'){
when {
diff --git a/docker/integration-tests/Dockerfile.unit-tests
b/docker/integration-tests/Dockerfile.unit-tests
index c432f7c..5d8aad4 100644
--- a/docker/integration-tests/Dockerfile.unit-tests
+++ b/docker/integration-tests/Dockerfile.unit-tests
@@ -41,6 +41,22 @@ ENV HOP_OPTIONS=-XX:+AggressiveHeap
RUN apk update \
&& apk add --no-cache bash curl procps \
+ msttcorefonts-installer \
+ fontconfig \
+ font-noto \
+ font-noto-adlam \
+ font-noto-adlamunjoined \
+ font-noto-arabic \
+ font-noto-armenian \
+ font-noto-avestan \
+ font-noto-bamum \
+ font-noto-bengali \
+ font-noto-buhid \
+ font-noto-carian \
+ font-noto-chakma \
+ font-noto-cherokee \
+ && update-ms-fonts \
+ && fc-cache -f \
&& rm -rf /var/cache/apk/* \
&& mkdir ${VOLUME_MOUNT_POINT} \
&& addgroup -g ${JENKINS_GID} ${JENKINS_GROUP} \
diff --git
a/integration-tests/scripting/main-0004-udjc-render-all-transforms-in-svg.hwf
b/integration-tests/scripting/local_main-0004-udjc-render-all-transforms-in-svg.hwf
similarity index 100%
rename from
integration-tests/scripting/main-0004-udjc-render-all-transforms-in-svg.hwf
rename to
integration-tests/scripting/local_main-0004-udjc-render-all-transforms-in-svg.hwf
diff --git
a/integration-tests/scripting/main-0005-udjc-render-all-actions-in-svg.hwf
b/integration-tests/scripting/local_main-0005-udjc-render-all-actions-in-svg.hwf
similarity index 100%
rename from
integration-tests/scripting/main-0005-udjc-render-all-actions-in-svg.hwf
rename to
integration-tests/scripting/local_main-0005-udjc-render-all-actions-in-svg.hwf
diff --git a/integration-tests/scripts/run-tests.sh
b/integration-tests/scripts/run-tests.sh
index b04f6d7..b28217e 100755
--- a/integration-tests/scripts/run-tests.sh
+++ b/integration-tests/scripts/run-tests.sh
@@ -79,7 +79,7 @@ for d in "${CURRENT_DIR}"/../*/ ; do
#cleanup project testcases
rm -f "${TMP_TESTCASES}"
- if [[ "$d" != *"scripts/" ]] && [[ "$d" != *"surefire-reports/" ]] ; then
+ if [[ "$d" != *"scripts/" ]] && [[ "$d" != *"surefire-reports/" ]] && [[
"$d" != *"hopweb/" ]]; then
#set test variables
start_time=$SECONDS
