From 703ce97c916c700600df5113bd54a03037a309c9 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 16:53:55 +0200 Subject: [PATCH 01/10] Some fixes: - update robot2doc in docker image if updates available - creating .docx only for XXXXX-dev and master branches Signed-off-by: reinaortega --- .jenkins.sh | 2 +- scripts/docker/Dockerfile | 2 ++ scripts/run-container.sh | 4 +++- scripts/validate.sh | 12 ++++++++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index 3bad4e68f..b10cf6c71 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -10,7 +10,7 @@ cd "$(dirname "$0")" run_dir="$(pwd)" bash ./scripts/build-container.sh -bash ./scripts/run-container.sh "${run_dir}" +bash ./scripts/run-container.sh "${run_dir}" "$(BRANCH_NAME)" ret=$? echo "Final validation result: $ret" diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile index 9f753df87..bf5f18016 100644 --- a/scripts/docker/Dockerfile +++ b/scripts/docker/Dockerfile @@ -35,6 +35,8 @@ ADD extensions /home/etsi/dev/robot/extensions RUN ls /home/etsi/dev/robot +#To avoid to use the cache when new commits are available +ADD "https://forge.etsi.org/rep/api/v4/projects/224/repository/branches/master" /tmp/devalidateCache RUN DEBIAN_FRONTED=noninteractive \ cd /home/etsi/dev/ \ diff --git a/scripts/run-container.sh b/scripts/run-container.sh index c0ea09699..febba94f4 100644 --- a/scripts/run-container.sh +++ b/scripts/run-container.sh @@ -7,8 +7,10 @@ mkdir -p build +echo "Using git branch $2" + docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \ - -c "/home/etsi/dev/robot/scripts/validate.sh" + -c "/home/etsi/dev/robot/scripts/validate.sh" "$2" ret=$? diff --git a/scripts/validate.sh b/scripts/validate.sh index ae06e2ea0..1f1e2784e 100644 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -17,11 +17,15 @@ for i in */*/*.robot ; do fi done -cd /home/etsi/dev/robot2doc/robot2doc +if [[ "$1" =~ .*-dev$ || "$1" == "master" ]]; then -mkdir -p /home/etsi/dev/build + cd /home/etsi/dev/robot2doc/robot2doc -python3 create_sols.py ../../robot 'local' ../../build -res2=$? + mkdir -p /home/etsi/dev/build + + python3 create_sols.py ../../robot 'local' ../../build + res2=$? +else res2=0 +fi exit $res && $res2 -- GitLab From ecc202078593f7ab9e186183ddc8b4a305a106c9 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:00:31 +0200 Subject: [PATCH 02/10] Fix using environment variable Signed-off-by: reinaortega --- .jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins.sh b/.jenkins.sh index b10cf6c71..042441043 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -10,7 +10,7 @@ cd "$(dirname "$0")" run_dir="$(pwd)" bash ./scripts/build-container.sh -bash ./scripts/run-container.sh "${run_dir}" "$(BRANCH_NAME)" +bash ./scripts/run-container.sh "${run_dir}" "${BRANCH_NAME}" ret=$? echo "Final validation result: $ret" -- GitLab From 99fc3deff56483107ecba0495ecd52fe97410290 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:13:59 +0200 Subject: [PATCH 03/10] Testing BRANCH_NAME environment variable Signed-off-by: reinaortega --- .jenkins.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.jenkins.sh b/.jenkins.sh index 042441043..40a63c09d 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -9,8 +9,11 @@ cd "$(dirname "$0")" run_dir="$(pwd)" +echo "Using git branch $BRANCH_NAME" +echo "Using git branch env.BRANCH_NAME" + bash ./scripts/build-container.sh -bash ./scripts/run-container.sh "${run_dir}" "${BRANCH_NAME}" +bash ./scripts/run-container.sh "${run_dir}" "$BRANCH_NAME" ret=$? echo "Final validation result: $ret" -- GitLab From 4f28f47e89e748185860bdc3a9620ded200979ff Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:16:29 +0200 Subject: [PATCH 04/10] Test env.BRANCH_NAME Signed-off-by: reinaortega --- .jenkins.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.jenkins.sh b/.jenkins.sh index 40a63c09d..c2a20eb09 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -11,6 +11,7 @@ run_dir="$(pwd)" echo "Using git branch $BRANCH_NAME" echo "Using git branch env.BRANCH_NAME" +echo env.BRANCH_NAME bash ./scripts/build-container.sh bash ./scripts/run-container.sh "${run_dir}" "$BRANCH_NAME" -- GitLab From a4df71d3b12eb61f4a6f04e4916924a83230bb61 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:20:54 +0200 Subject: [PATCH 05/10] Test GIT_BRANCH Signed-off-by: reinaortega --- .jenkins.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.jenkins.sh b/.jenkins.sh index c2a20eb09..dbf5ad646 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -12,6 +12,9 @@ run_dir="$(pwd)" echo "Using git branch $BRANCH_NAME" echo "Using git branch env.BRANCH_NAME" echo env.BRANCH_NAME +echo "Using git branch $GIT_BRANCH" +echo "Using git branch 'env.GIT_BRANCH'" +echo 'env.GIT_BRANCH' bash ./scripts/build-container.sh bash ./scripts/run-container.sh "${run_dir}" "$BRANCH_NAME" -- GitLab From 8dcbb660ee8426d3891cef0b9d60ee35ac8c67a1 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:25:18 +0200 Subject: [PATCH 06/10] Using GIT_BRANCH Signed-off-by: reinaortega --- .jenkins.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index dbf5ad646..010affd4a 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -9,15 +9,10 @@ cd "$(dirname "$0")" run_dir="$(pwd)" -echo "Using git branch $BRANCH_NAME" -echo "Using git branch env.BRANCH_NAME" -echo env.BRANCH_NAME echo "Using git branch $GIT_BRANCH" -echo "Using git branch 'env.GIT_BRANCH'" -echo 'env.GIT_BRANCH' bash ./scripts/build-container.sh -bash ./scripts/run-container.sh "${run_dir}" "$BRANCH_NAME" +bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" ret=$? echo "Final validation result: $ret" -- GitLab From 36e07d2289284b21d796be28fc0302586dd42134 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:34:34 +0200 Subject: [PATCH 07/10] Checking git branch used in validate.sh script Signed-off-by: reinaortega --- scripts/validate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/validate.sh b/scripts/validate.sh index 1f1e2784e..e6945847e 100644 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -17,6 +17,8 @@ for i in */*/*.robot ; do fi done +echo "Using git branch $1" + if [[ "$1" =~ .*-dev$ || "$1" == "master" ]]; then cd /home/etsi/dev/robot2doc/robot2doc -- GitLab From e0ccb34e7170a3c69f7c2321a2858c8c2f6dbb38 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:41:49 +0200 Subject: [PATCH 08/10] Fix run-container.sh script Signed-off-by: reinaortega --- scripts/run-container.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-container.sh b/scripts/run-container.sh index febba94f4..af5a8eb9b 100644 --- a/scripts/run-container.sh +++ b/scripts/run-container.sh @@ -10,7 +10,7 @@ mkdir -p build echo "Using git branch $2" docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \ - -c "/home/etsi/dev/robot/scripts/validate.sh" "$2" + -c "/home/etsi/dev/robot/scripts/validate.sh $2" ret=$? -- GitLab From 71feebb2c3711afbeac0845488f77aba82802b6c Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 16 Jun 2021 17:58:56 +0200 Subject: [PATCH 09/10] Matching tag names Signed-off-by: reinaortega --- scripts/validate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/validate.sh b/scripts/validate.sh index e6945847e..7e50abcd5 100644 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -19,7 +19,7 @@ done echo "Using git branch $1" -if [[ "$1" =~ .*-dev$ || "$1" == "master" ]]; then +if [[ "$1" =~ .*-dev$ || "$1" =~ \d+(\.?\d)+ || "$1" == "master" ]]; then cd /home/etsi/dev/robot2doc/robot2doc -- GitLab From 88c9c1c62b6e070f720792b431166dd67f6b619c Mon Sep 17 00:00:00 2001 From: reinaortega Date: Thu, 17 Jun 2021 11:25:47 +0200 Subject: [PATCH 10/10] Cleanup build folder before new files are generated Signed-off-by: reinaortega --- scripts/validate.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/validate.sh b/scripts/validate.sh index 7e50abcd5..bf93a7535 100644 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -19,12 +19,14 @@ done echo "Using git branch $1" +mkdir -p /home/etsi/dev/build +cd /home/etsi/dev/build +rm -r -v * + if [[ "$1" =~ .*-dev$ || "$1" =~ \d+(\.?\d)+ || "$1" == "master" ]]; then cd /home/etsi/dev/robot2doc/robot2doc - mkdir -p /home/etsi/dev/build - python3 create_sols.py ../../robot 'local' ../../build res2=$? else res2=0 -- GitLab