From 1a67f5929883e9713b4faa4413ed0a2f5b40e43e Mon Sep 17 00:00:00 2001 From: Sushant Date: Fri, 19 Jul 2024 14:35:15 +0530 Subject: [PATCH 1/4] CU-86bzn78dn - Build issue in the Main branch --- JeMPI_Apps/build-all-java.sh | 21 +++++++++++++-------- JeMPI_Apps/build-all-ui.sh | 7 ++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/JeMPI_Apps/build-all-java.sh b/JeMPI_Apps/build-all-java.sh index 4c87b1ee3..ccefa13eb 100755 --- a/JeMPI_Apps/build-all-java.sh +++ b/JeMPI_Apps/build-all-java.sh @@ -6,34 +6,39 @@ set -u cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API/src/main/resources/config-api.json cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API_KC/src/main/resources/config-api.json +if [ $# -eq 0 ]; then + tag_to_use="ci-test-main" +else + tag_to_use=$1 +fi mvn clean package pushd JeMPI_EM_Scala sbt clean assembly popd pushd JeMPI_AsyncReceiver - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_ETL - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Controller - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_EM_Scala - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Linker - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API_KC - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Bootstrapper - ./build.sh || exit 1 + CI=false TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_AsyncReceiver ./push.sh diff --git a/JeMPI_Apps/build-all-ui.sh b/JeMPI_Apps/build-all-ui.sh index 3ba7d64ce..62b49db4c 100755 --- a/JeMPI_Apps/build-all-ui.sh +++ b/JeMPI_Apps/build-all-ui.sh @@ -2,9 +2,14 @@ set -e set -u +if [ $# -eq 0 ]; then + tag_to_use="ci-test-main" +else + tag_to_use=$1 +fi pushd JeMPI_UI - ./build-image.sh || exit 1 + CI=false TAG=$tag_to_use ./build-image.sh || exit 1 popd pushd JeMPI_UI From 6e979b91584410d18144b3d13a78496c394dfc08 Mon Sep 17 00:00:00 2001 From: Sushant Date: Fri, 19 Jul 2024 17:55:33 +0530 Subject: [PATCH 2/4] Added variable for CI --- JeMPI_Apps/build-all-ci.sh | 19 ++++++++++--------- JeMPI_Apps/build-all-java.sh | 17 +++++++++-------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/JeMPI_Apps/build-all-ci.sh b/JeMPI_Apps/build-all-ci.sh index 2ff283c60..582933538 100755 --- a/JeMPI_Apps/build-all-ci.sh +++ b/JeMPI_Apps/build-all-ci.sh @@ -3,6 +3,7 @@ set -e set -u +CI=${CI:-true} if [ $# -eq 0 ]; then tag_to_use="ci-test-main" else @@ -25,29 +26,29 @@ popd docker buildx create --name container --driver=docker-container pushd JeMPI_AsyncReceiver - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_ETL - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Controller - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_EM_Scala - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Linker - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API_KC - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Bootstrapper - CI=true TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_UI - CI=true TAG=$tag_to_use ./build-image.sh || exit 1 + $CI TAG=$tag_to_use ./build-image.sh || exit 1 popd \ No newline at end of file diff --git a/JeMPI_Apps/build-all-java.sh b/JeMPI_Apps/build-all-java.sh index ccefa13eb..799a01202 100755 --- a/JeMPI_Apps/build-all-java.sh +++ b/JeMPI_Apps/build-all-java.sh @@ -6,6 +6,7 @@ set -u cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API/src/main/resources/config-api.json cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API_KC/src/main/resources/config-api.json +CI=${CI:-false} if [ $# -eq 0 ]; then tag_to_use="ci-test-main" else @@ -17,28 +18,28 @@ pushd JeMPI_EM_Scala popd pushd JeMPI_AsyncReceiver - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_ETL - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Controller - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_EM_Scala - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Linker - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API_KC - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Bootstrapper - CI=false TAG=$tag_to_use ./build.sh || exit 1 + $CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_AsyncReceiver ./push.sh From 6f7d7ccfbd36a73a43b495ddefb37f19d03f9d83 Mon Sep 17 00:00:00 2001 From: Sushant Date: Fri, 19 Jul 2024 18:05:36 +0530 Subject: [PATCH 3/4] Added variable for CI --- JeMPI_Apps/build-all-ci.sh | 20 ++++++++++---------- JeMPI_Apps/build-all-java.sh | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/JeMPI_Apps/build-all-ci.sh b/JeMPI_Apps/build-all-ci.sh index 582933538..b51c01d2b 100755 --- a/JeMPI_Apps/build-all-ci.sh +++ b/JeMPI_Apps/build-all-ci.sh @@ -3,7 +3,7 @@ set -e set -u -CI=${CI:-true} +CI="${CI:-true}" if [ $# -eq 0 ]; then tag_to_use="ci-test-main" else @@ -26,29 +26,29 @@ popd docker buildx create --name container --driver=docker-container pushd JeMPI_AsyncReceiver - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_ETL - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Controller - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_EM_Scala - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Linker - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API_KC - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Bootstrapper - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_UI - $CI TAG=$tag_to_use ./build-image.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build-image.sh || exit 1 popd \ No newline at end of file diff --git a/JeMPI_Apps/build-all-java.sh b/JeMPI_Apps/build-all-java.sh index 799a01202..75f613a35 100755 --- a/JeMPI_Apps/build-all-java.sh +++ b/JeMPI_Apps/build-all-java.sh @@ -6,7 +6,7 @@ set -u cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API/src/main/resources/config-api.json cp -L -f ./JeMPI_Configuration/config-api.json ./JeMPI_API_KC/src/main/resources/config-api.json -CI=${CI:-false} +CI="${CI:-false}" if [ $# -eq 0 ]; then tag_to_use="ci-test-main" else @@ -18,28 +18,28 @@ pushd JeMPI_EM_Scala popd pushd JeMPI_AsyncReceiver - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_ETL - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Controller - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_EM_Scala - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Linker - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_API_KC - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_Bootstrapper - $CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_AsyncReceiver ./push.sh From bc5855e4e6c2fdd29d41ea72c8144537e836b339 Mon Sep 17 00:00:00 2001 From: Sushant Date: Fri, 19 Jul 2024 18:10:25 +0530 Subject: [PATCH 4/4] Added variable for CI --- JeMPI_Apps/build-all-java.sh | 2 +- JeMPI_Apps/build-all-ui.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/JeMPI_Apps/build-all-java.sh b/JeMPI_Apps/build-all-java.sh index 75f613a35..4a46667c5 100755 --- a/JeMPI_Apps/build-all-java.sh +++ b/JeMPI_Apps/build-all-java.sh @@ -18,7 +18,7 @@ pushd JeMPI_EM_Scala popd pushd JeMPI_AsyncReceiver - CI=CI=$CI TAG=$tag_to_use ./build.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build.sh || exit 1 popd pushd JeMPI_ETL CI=$CI TAG=$tag_to_use ./build.sh || exit 1 diff --git a/JeMPI_Apps/build-all-ui.sh b/JeMPI_Apps/build-all-ui.sh index 62b49db4c..888f7cd27 100755 --- a/JeMPI_Apps/build-all-ui.sh +++ b/JeMPI_Apps/build-all-ui.sh @@ -2,6 +2,8 @@ set -e set -u + +CI="${CI:-false}" if [ $# -eq 0 ]; then tag_to_use="ci-test-main" else @@ -9,7 +11,7 @@ else fi pushd JeMPI_UI - CI=false TAG=$tag_to_use ./build-image.sh || exit 1 + CI=$CI TAG=$tag_to_use ./build-image.sh || exit 1 popd pushd JeMPI_UI