From 36b4ea70059ec22a0ca4f37b087d5d2ba4c24130 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:11:40 +0300 Subject: [PATCH 01/20] update plan spec --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 1 + libs/common-ui | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index b825c5b0b..c454b1af5 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -67,6 +67,7 @@ public class PlanSpec { .name("redaction-ui") .url("ssh://git@git.iqser.com:2222/red/ui.git") .branch("master") + .submodulesEnabled(true) .authentication(new SharedCredentialsIdentifier("bamboo-agent") .scope(SharedCredentialsScope.GLOBAL))) .planBranchManagement(new PlanBranchManagement().createForVcsBranch().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(30)).notificationForCommitters()); diff --git a/libs/common-ui b/libs/common-ui index 4527494d7..d31b702c2 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 4527494d728d622bdd5d85aea72a7770fa1a8f14 +Subproject commit d31b702c22ac1a9e925db673ef83f56c7137071b From 8cce49cc2dc41966e3f80565e7e85c34dc26368f Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:14:32 +0300 Subject: [PATCH 02/20] ssh for submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 39e2c76ea..45ec1707f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libs/common-ui"] path = libs/common-ui - url = https://git.iqser.com/scm/sl/common-ui.git + url = ssh://git@git.iqser.com:2222/sl/common-ui.git From 7dca9546c2832eaab44cd1544ebddacbe93e47a9 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:19:54 +0300 Subject: [PATCH 03/20] build attempt fix --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index c454b1af5..f25c430f8 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -70,6 +70,12 @@ public class PlanSpec { .submodulesEnabled(true) .authentication(new SharedCredentialsIdentifier("bamboo-agent") .scope(SharedCredentialsScope.GLOBAL))) + .planRepositories(new GitRepository() + .name("common-ui") + .url("ssh://git@git.iqser.com:2222/sl/common-ui.git") + .branch("master") + .authentication(new SharedCredentialsIdentifier("bamboo-agent") + .scope(SharedCredentialsScope.GLOBAL))) .planBranchManagement(new PlanBranchManagement().createForVcsBranch().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(30)).notificationForCommitters()); } @@ -78,7 +84,10 @@ public class PlanSpec { .tasks( new CleanWorkingDirectoryTask().description("My clean working directory task"), // Checkout - new VcsCheckoutTask().description("Checkout Default Repository") + new VcsCheckoutTask().description("Checkout Common UI Repository") + .checkoutItems(new CheckoutItem().repository("common-ui").path("common-ui")), + + new VcsCheckoutTask().description("Checkout Redaction Repository") .checkoutItems(new CheckoutItem().repository("redaction-ui").path("redaction-ui")), // Build From c0b8c3a53e43328003219d3813193c445eb3e27a Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:23:53 +0300 Subject: [PATCH 04/20] build attempt fix --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 3 +++ bamboo-specs/src/main/resources/scripts/build.sh | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index f25c430f8..d0fbf8fd7 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -74,6 +74,9 @@ public class PlanSpec { .name("common-ui") .url("ssh://git@git.iqser.com:2222/sl/common-ui.git") .branch("master") + .verboseLogs(true) + .fetchWholeRepository(true) + .shallowClonesEnabled(false) .authentication(new SharedCredentialsIdentifier("bamboo-agent") .scope(SharedCredentialsScope.GLOBAL))) .planBranchManagement(new PlanBranchManagement().createForVcsBranch().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(30)).notificationForCommitters()); diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index d34808bc2..887a60dc3 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -5,6 +5,11 @@ set -e imageName="nexus.iqser.com:5001/red/$PROJECT" dockerfileLocation="docker/$PROJECT/Dockerfile" +commonUIVersion=$(git submodule status | awk '{ print $1; }') +echo $commonUIVersion +mv ../common-ui ./libs/ +git --git-dir ./libs/common-ui checkout $commonUIVersion + echo "On branch $bamboo_planRepository_branchName building project $PROJECT" # shellcheck disable=SC2154 if [[ "$bamboo_planRepository_branchName" == "master" ]] From 533683b71400ce3baba03eb35bf2fb3af28e0b2d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:27:42 +0300 Subject: [PATCH 05/20] build attempt fix --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index d0fbf8fd7..3b7b17b7a 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -67,7 +67,7 @@ public class PlanSpec { .name("redaction-ui") .url("ssh://git@git.iqser.com:2222/red/ui.git") .branch("master") - .submodulesEnabled(true) +// .submodulesEnabled(true) .authentication(new SharedCredentialsIdentifier("bamboo-agent") .scope(SharedCredentialsScope.GLOBAL))) .planRepositories(new GitRepository() From aa13a03e29f29c7e10c218581ff99c527add89ad Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:29:47 +0300 Subject: [PATCH 06/20] build attempt fix --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 3b7b17b7a..b881d4e2c 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -88,7 +88,7 @@ public class PlanSpec { new CleanWorkingDirectoryTask().description("My clean working directory task"), // Checkout new VcsCheckoutTask().description("Checkout Common UI Repository") - .checkoutItems(new CheckoutItem().repository("common-ui").path("common-ui")), + .checkoutItems(new CheckoutItem().repository("common-ui").path("common-ui")).cleanCheckout(true), new VcsCheckoutTask().description("Checkout Redaction Repository") .checkoutItems(new CheckoutItem().repository("redaction-ui").path("redaction-ui")), From acdba6b482623ac5a04b5ae2e815d503e7cee774 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:31:19 +0300 Subject: [PATCH 07/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 887a60dc3..ab8914c62 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -7,9 +7,14 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion +ls -la ../common-ui + mv ../common-ui ./libs/ + git --git-dir ./libs/common-ui checkout $commonUIVersion + + echo "On branch $bamboo_planRepository_branchName building project $PROJECT" # shellcheck disable=SC2154 if [[ "$bamboo_planRepository_branchName" == "master" ]] From e0a2d0000e435c521c88e49933b5999d41401eea Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:31:42 +0300 Subject: [PATCH 08/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index ab8914c62..82be0ee88 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -7,7 +7,7 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion -ls -la ../common-ui +ls -lah ../common-ui mv ../common-ui ./libs/ From 3c67bf9c014179e9b7ff894af1b02ec0c3e28f5c Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:32:19 +0300 Subject: [PATCH 09/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 82be0ee88..e6c9c5a27 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -8,10 +8,10 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion ls -lah ../common-ui - +git --git-dir ../common-ui checkout $commonUIVersion mv ../common-ui ./libs/ -git --git-dir ./libs/common-ui checkout $commonUIVersion + From 7725042dbab893388038c1e0251897faa1ca0fb9 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:33:10 +0300 Subject: [PATCH 10/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index e6c9c5a27..ae0778c83 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -8,7 +8,9 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion ls -lah ../common-ui -git --git-dir ../common-ui checkout $commonUIVersion +cd ../common-ui +git status +git checkout $commonUIVersion mv ../common-ui ./libs/ From e575b94e6f0878564f30bd86bc35078ffe3180f2 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:34:05 +0300 Subject: [PATCH 11/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index ae0778c83..5cac559a6 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -7,7 +7,7 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion -ls -lah ../common-ui +ls -lah ../common-ui/.git cd ../common-ui git status git checkout $commonUIVersion From 2372872468702d9f4d0455bf68c2b22bdfa1a90a Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:35:26 +0300 Subject: [PATCH 12/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 5cac559a6..f28a547f0 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -7,6 +7,8 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion + +sleep 24h ls -lah ../common-ui/.git cd ../common-ui git status From 6514f8447a705fb3e3728bdf297a6fb94d41c3e3 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:40:21 +0300 Subject: [PATCH 13/20] build attempt fix --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index b881d4e2c..1c34c1fa5 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -75,6 +75,7 @@ public class PlanSpec { .url("ssh://git@git.iqser.com:2222/sl/common-ui.git") .branch("master") .verboseLogs(true) + .remoteAgentCacheEnabled(false) .fetchWholeRepository(true) .shallowClonesEnabled(false) .authentication(new SharedCredentialsIdentifier("bamboo-agent") From 43bd37d7de0b070b772f9768e28882a59b88143c Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:40:54 +0300 Subject: [PATCH 14/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index f28a547f0..fb6a17f19 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -7,18 +7,11 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion - -sleep 24h -ls -lah ../common-ui/.git -cd ../common-ui git status -git checkout $commonUIVersion +git --git-dir ../common-ui checkout $commonUIVersion mv ../common-ui ./libs/ - - - echo "On branch $bamboo_planRepository_branchName building project $PROJECT" # shellcheck disable=SC2154 if [[ "$bamboo_planRepository_branchName" == "master" ]] From 07b4386859575d6254418ba33a356a38fab5bb27 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:42:02 +0300 Subject: [PATCH 15/20] build attempt fix --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 1c34c1fa5..c11bc0b61 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -67,6 +67,10 @@ public class PlanSpec { .name("redaction-ui") .url("ssh://git@git.iqser.com:2222/red/ui.git") .branch("master") + .verboseLogs(true) + .remoteAgentCacheEnabled(false) + .fetchWholeRepository(true) + .shallowClonesEnabled(false) // .submodulesEnabled(true) .authentication(new SharedCredentialsIdentifier("bamboo-agent") .scope(SharedCredentialsScope.GLOBAL))) From 152bd49e9ce7f4870036e18ff7ca404a8a73be0c Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:44:00 +0300 Subject: [PATCH 16/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index fb6a17f19..84baf75a8 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -7,7 +7,9 @@ dockerfileLocation="docker/$PROJECT/Dockerfile" commonUIVersion=$(git submodule status | awk '{ print $1; }') echo $commonUIVersion +echo "STATUS -----" git status +echo "STATUS -----" git --git-dir ../common-ui checkout $commonUIVersion mv ../common-ui ./libs/ From 708835be4a47ec19eea098c4b1c5345731bccfac Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:44:16 +0300 Subject: [PATCH 17/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 84baf75a8..93832de33 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -10,6 +10,7 @@ echo $commonUIVersion echo "STATUS -----" git status echo "STATUS -----" +sleep 25h git --git-dir ../common-ui checkout $commonUIVersion mv ../common-ui ./libs/ From 671ad3185feae55c5ed72bcc1d531b24b04cf17b Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:46:23 +0300 Subject: [PATCH 18/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 93832de33..7d7c2f89f 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -10,8 +10,11 @@ echo $commonUIVersion echo "STATUS -----" git status echo "STATUS -----" -sleep 25h -git --git-dir ../common-ui checkout $commonUIVersion +cd ../common-ui +git status +git checkout $commonUIVersion +exit 1 + mv ../common-ui ./libs/ From cca77ff6b7052c693799f976a55eadffe161e376 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:48:41 +0300 Subject: [PATCH 19/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 7d7c2f89f..7b1befd45 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -5,7 +5,8 @@ set -e imageName="nexus.iqser.com:5001/red/$PROJECT" dockerfileLocation="docker/$PROJECT/Dockerfile" -commonUIVersion=$(git submodule status | awk '{ print $1; }') +git submodule status +commonUIVersion=$(git submodule status | awk '{ print $1 }') echo $commonUIVersion echo "STATUS -----" git status From d0475a6b46b8f05164938cace2da94d65543d649 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 23 Aug 2021 14:51:58 +0300 Subject: [PATCH 20/20] build attempt fix --- bamboo-specs/src/main/resources/scripts/build.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 7b1befd45..0f791311e 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -6,19 +6,13 @@ imageName="nexus.iqser.com:5001/red/$PROJECT" dockerfileLocation="docker/$PROJECT/Dockerfile" git submodule status -commonUIVersion=$(git submodule status | awk '{ print $1 }') +commonUIVersion=$(git submodule status | awk '{ print $1 }' | sed 's|-||g') echo $commonUIVersion -echo "STATUS -----" -git status -echo "STATUS -----" cd ../common-ui -git status git checkout $commonUIVersion -exit 1 - +cd ../redaction-ui mv ../common-ui ./libs/ - echo "On branch $bamboo_planRepository_branchName building project $PROJECT" # shellcheck disable=SC2154 if [[ "$bamboo_planRepository_branchName" == "master" ]]