From 6240c7c98a58dcf5af5e6720483241732047cfa5 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Sat, 14 Aug 2021 10:07:30 +0200 Subject: [PATCH 1/9] Hivetap testing tool automatization --- .jenkins.sh | 7 +++++ scripts/run-hivetap-container.sh | 47 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 scripts/run-hivetap-container.sh diff --git a/.jenkins.sh b/.jenkins.sh index 010affd4a..dd84682c5 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -14,6 +14,13 @@ echo "Using git branch $GIT_BRANCH" bash ./scripts/build-container.sh bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" +if [[ "$1" =~ .*fix-plu-test$ ]]; then + + apiTestsVersion=$(echo $1 | cut -d'-' -f 1) + echo apiTestsVersion + + bash ./scripts/run-hivetap-container.sh "$apiTestsVersion" +fi ret=$? echo "Final validation result: $ret" exit $ret diff --git a/scripts/run-hivetap-container.sh b/scripts/run-hivetap-container.sh new file mode 100644 index 000000000..24a7ddbcb --- /dev/null +++ b/scripts/run-hivetap-container.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# Copyright ETSI 2019 +# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt + +#set -e +#set -vx + +mkdir -p testTools + +echo "Creating htap plugins from robots tests for version $1" + +docker run "$(pwd):/robot-tests" nfv-robot-hivetap-tt:$1 ./codegen.py --test-type conformance-NFV --docker-image etsiforge/nfv-robot-hivetap-tt --docker-version $1 + +#docker run --rm nfv-robot-hivetap-tt:$1 ./codegen.py --test-type conformance-NFV --docker-image etsiforge/nfv-robot-hivetap-tt --docker-version $1 + +ret=$? + +if [ $ret != 0 ]; then + + #env + echo "Registry: $CI_REGISTRY" + echo "Registry user: $CI_REGISTRY_USER" + #echo "Password: $CI_REGISTRY_PASSWORD" + + #DOCKER_HUB_USER="fedesismo" + #DOCKER_HUB_TOKEN="e5d851dd-c5bd-4c16-8fcd-1ef6374f9c1c" + echo "Docker hub user: $DOCKER_HUB_USER" + + echo ${DOCKER_HUB_TOKEN} | docker login -u "${DOCKER_HUB_USER}" --password-stdin + + #echo ${CI_REGISTRY_PASSWORD} | docker login "${CI_REGISTRY}" -u "${CI_REGISTRY_USER}" --password-stdin + #docker login osm.etsi.org:5050 -u project_86_bot -p XPKsSL9TL2KZ1Mj3SCR2 + echo "Pushing NFV Test Tool version $1... " + docker tag "nfv-robot-hivetap-tt:$1" "etsiforge/nfv-robot-hivetap-tt:$1" + docker push "etsiforge/nfv-robot-hivetap-tt:$1" + docker logout + #docker logout "$CI_REGISTRY" + ret1=$? + + #docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \ + # -c "/home/etsi/dev/robot/scripts/validate.sh $2" +else + ret1=0 +fi + +exit $ret && $ret1 + -- GitLab From 0a0f8c4fd9dbb7c118d1a3f6160e0116adeccc81 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Sat, 14 Aug 2021 10:18:44 +0200 Subject: [PATCH 2/9] Fix apiTestVersion variable --- .jenkins.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index dd84682c5..f3d00a5d0 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -14,9 +14,10 @@ echo "Using git branch $GIT_BRANCH" bash ./scripts/build-container.sh bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" -if [[ "$1" =~ .*fix-plu-test$ ]]; then +if [[ "$GIT_BRANCH" =~ .*fix-plu-test$ ]]; then - apiTestsVersion=$(echo $1 | cut -d'-' -f 1) + apiTestsVersion=$(echo $GIT_BRANCH | cut -d'/' -f 2) + apiTestsVersion=$(echo $apiTestsVersion | cut -d'-' -f 1) echo apiTestsVersion bash ./scripts/run-hivetap-container.sh "$apiTestsVersion" -- GitLab From ddcfcdd36c49a15fa89da243987c589d8d4b8a90 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Sat, 14 Aug 2021 10:37:53 +0200 Subject: [PATCH 3/9] Result verification --- scripts/run-hivetap-container.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/run-hivetap-container.sh b/scripts/run-hivetap-container.sh index 24a7ddbcb..4fce6a927 100644 --- a/scripts/run-hivetap-container.sh +++ b/scripts/run-hivetap-container.sh @@ -15,6 +15,8 @@ docker run "$(pwd):/robot-tests" nfv-robot-hivetap-tt:$1 ./codegen.py --test-typ ret=$? +echo "Result from hivetap code generation: $ret" + if [ $ret != 0 ]; then #env @@ -36,7 +38,7 @@ if [ $ret != 0 ]; then docker logout #docker logout "$CI_REGISTRY" ret1=$? - + echo "Result from image deployment $ret1" #docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \ # -c "/home/etsi/dev/robot/scripts/validate.sh $2" else -- GitLab From 053e19139370571ca811d33afbdf107de9e25c17 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Sat, 14 Aug 2021 10:59:31 +0200 Subject: [PATCH 4/9] Adding volume parameter --- scripts/run-hivetap-container.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-hivetap-container.sh b/scripts/run-hivetap-container.sh index 4fce6a927..22cc4b315 100644 --- a/scripts/run-hivetap-container.sh +++ b/scripts/run-hivetap-container.sh @@ -9,7 +9,7 @@ mkdir -p testTools echo "Creating htap plugins from robots tests for version $1" -docker run "$(pwd):/robot-tests" nfv-robot-hivetap-tt:$1 ./codegen.py --test-type conformance-NFV --docker-image etsiforge/nfv-robot-hivetap-tt --docker-version $1 +docker run -v "$(pwd):/robot-tests" "nfv-robot-hivetap-tt:$1" ./codegen.py --test-type conformance-NFV --docker-image etsiforge/nfv-robot-hivetap-tt --docker-version "$1" #docker run --rm nfv-robot-hivetap-tt:$1 ./codegen.py --test-type conformance-NFV --docker-image etsiforge/nfv-robot-hivetap-tt --docker-version $1 -- GitLab From 57a44922a8ab85ce63f2095a5131c1d90476980a Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 25 Aug 2021 20:18:56 +0200 Subject: [PATCH 5/9] Trigger robot hive tap testing tools project --- .jenkins.sh | 9 ++++++++- scripts/run-hivetap-container.sh | 8 +++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index f3d00a5d0..9de86903e 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -20,7 +20,14 @@ if [[ "$GIT_BRANCH" =~ .*fix-plu-test$ ]]; then apiTestsVersion=$(echo $apiTestsVersion | cut -d'-' -f 1) echo apiTestsVersion - bash ./scripts/run-hivetap-container.sh "$apiTestsVersion" + #bash ./scripts/run-hivetap-container.sh "$apiTestsVersion" + + curl -X POST \ + -F token=7f9ef6e8976ee85a1e5e3e849c2e2d \ + -F ref=develop \ + -F "variables[API_TESTS_VERSION]=$apiTestsVersion" \ + -F "variables[TEST_SUITE]='NFV'" \ + https://forge.etsi.org/rep/api/v4/projects/484/trigger/pipeline fi ret=$? echo "Final validation result: $ret" diff --git a/scripts/run-hivetap-container.sh b/scripts/run-hivetap-container.sh index 22cc4b315..e6d795002 100644 --- a/scripts/run-hivetap-container.sh +++ b/scripts/run-hivetap-container.sh @@ -24,15 +24,13 @@ if [ $ret != 0 ]; then echo "Registry user: $CI_REGISTRY_USER" #echo "Password: $CI_REGISTRY_PASSWORD" - #DOCKER_HUB_USER="fedesismo" - #DOCKER_HUB_TOKEN="e5d851dd-c5bd-4c16-8fcd-1ef6374f9c1c" - echo "Docker hub user: $DOCKER_HUB_USER" + echo "Docker hub user: $DOCKER_HUB_USER" echo ${DOCKER_HUB_TOKEN} | docker login -u "${DOCKER_HUB_USER}" --password-stdin #echo ${CI_REGISTRY_PASSWORD} | docker login "${CI_REGISTRY}" -u "${CI_REGISTRY_USER}" --password-stdin - #docker login osm.etsi.org:5050 -u project_86_bot -p XPKsSL9TL2KZ1Mj3SCR2 - echo "Pushing NFV Test Tool version $1... " + + echo "Pushing NFV Test Tool version $1... " docker tag "nfv-robot-hivetap-tt:$1" "etsiforge/nfv-robot-hivetap-tt:$1" docker push "etsiforge/nfv-robot-hivetap-tt:$1" docker logout -- GitLab From 750042dad1fc59c7769d6199881406570341fd2a Mon Sep 17 00:00:00 2001 From: reinaortega Date: Wed, 25 Aug 2021 20:28:32 +0200 Subject: [PATCH 6/9] build develop-test --- .jenkins.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index 9de86903e..e5f9b6f59 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -11,8 +11,8 @@ run_dir="$(pwd)" echo "Using git branch $GIT_BRANCH" -bash ./scripts/build-container.sh -bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" +#bash ./scripts/build-container.sh +#bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" if [[ "$GIT_BRANCH" =~ .*fix-plu-test$ ]]; then @@ -24,7 +24,7 @@ if [[ "$GIT_BRANCH" =~ .*fix-plu-test$ ]]; then curl -X POST \ -F token=7f9ef6e8976ee85a1e5e3e849c2e2d \ - -F ref=develop \ + -F ref=develop-test \ -F "variables[API_TESTS_VERSION]=$apiTestsVersion" \ -F "variables[TEST_SUITE]='NFV'" \ https://forge.etsi.org/rep/api/v4/projects/484/trigger/pipeline -- GitLab From 619ade32d019c375b5afa2a0ff16f56112232d4e Mon Sep 17 00:00:00 2001 From: reinaortega Date: Thu, 26 Aug 2021 11:25:35 +0200 Subject: [PATCH 7/9] Fixing TEST_SUITE variable --- .jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins.sh b/.jenkins.sh index e5f9b6f59..5b9fc41c1 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -26,7 +26,7 @@ if [[ "$GIT_BRANCH" =~ .*fix-plu-test$ ]]; then -F token=7f9ef6e8976ee85a1e5e3e849c2e2d \ -F ref=develop-test \ -F "variables[API_TESTS_VERSION]=$apiTestsVersion" \ - -F "variables[TEST_SUITE]='NFV'" \ + -F "variables[TEST_SUITE]=NFV" \ https://forge.etsi.org/rep/api/v4/projects/484/trigger/pipeline fi ret=$? -- GitLab From b1c3ea87d25fc66adc984fb94d878cce0439c0f8 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Mon, 30 Aug 2021 12:29:04 +0200 Subject: [PATCH 8/9] Use jenkins variable for token --- .jenkins.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jenkins.sh b/.jenkins.sh index 5b9fc41c1..879f4244b 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -23,8 +23,8 @@ if [[ "$GIT_BRANCH" =~ .*fix-plu-test$ ]]; then #bash ./scripts/run-hivetap-container.sh "$apiTestsVersion" curl -X POST \ - -F token=7f9ef6e8976ee85a1e5e3e849c2e2d \ - -F ref=develop-test \ + -F token=${ROBOT_HIVE_TAP_TT_TOKEN} \ + -F ref=master \ -F "variables[API_TESTS_VERSION]=$apiTestsVersion" \ -F "variables[TEST_SUITE]=NFV" \ https://forge.etsi.org/rep/api/v4/projects/484/trigger/pipeline -- GitLab From d300abbe3778bd246195db2b0334a8e4c4d1b8a3 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Tue, 31 Aug 2021 05:02:50 +0200 Subject: [PATCH 9/9] Final update --- .jenkins.sh | 8 ++---- scripts/run-hivetap-container.sh | 47 -------------------------------- 2 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 scripts/run-hivetap-container.sh diff --git a/.jenkins.sh b/.jenkins.sh index 879f4244b..22ed7fcf2 100644 --- a/.jenkins.sh +++ b/.jenkins.sh @@ -11,17 +11,15 @@ run_dir="$(pwd)" echo "Using git branch $GIT_BRANCH" -#bash ./scripts/build-container.sh -#bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" +bash ./scripts/build-container.sh +bash ./scripts/run-container.sh "${run_dir}" "$GIT_BRANCH" -if [[ "$GIT_BRANCH" =~ .*fix-plu-test$ ]]; then +if [[ "$GIT_BRANCH" =~ .*fix-plu$ ]]; then apiTestsVersion=$(echo $GIT_BRANCH | cut -d'/' -f 2) apiTestsVersion=$(echo $apiTestsVersion | cut -d'-' -f 1) echo apiTestsVersion - #bash ./scripts/run-hivetap-container.sh "$apiTestsVersion" - curl -X POST \ -F token=${ROBOT_HIVE_TAP_TT_TOKEN} \ -F ref=master \ diff --git a/scripts/run-hivetap-container.sh b/scripts/run-hivetap-container.sh deleted file mode 100644 index e6d795002..000000000 --- a/scripts/run-hivetap-container.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright ETSI 2019 -# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt - -#set -e -#set -vx - -mkdir -p testTools - -echo "Creating htap plugins from robots tests for version $1" - -docker run -v "$(pwd):/robot-tests" "nfv-robot-hivetap-tt:$1" ./codegen.py --test-type conformance-NFV --docker-image etsiforge/nfv-robot-hivetap-tt --docker-version "$1" - -#docker run --rm nfv-robot-hivetap-tt:$1 ./codegen.py --test-type conformance-NFV --docker-image etsiforge/nfv-robot-hivetap-tt --docker-version $1 - -ret=$? - -echo "Result from hivetap code generation: $ret" - -if [ $ret != 0 ]; then - - #env - echo "Registry: $CI_REGISTRY" - echo "Registry user: $CI_REGISTRY_USER" - #echo "Password: $CI_REGISTRY_PASSWORD" - - echo "Docker hub user: $DOCKER_HUB_USER" - - echo ${DOCKER_HUB_TOKEN} | docker login -u "${DOCKER_HUB_USER}" --password-stdin - - #echo ${CI_REGISTRY_PASSWORD} | docker login "${CI_REGISTRY}" -u "${CI_REGISTRY_USER}" --password-stdin - - echo "Pushing NFV Test Tool version $1... " - docker tag "nfv-robot-hivetap-tt:$1" "etsiforge/nfv-robot-hivetap-tt:$1" - docker push "etsiforge/nfv-robot-hivetap-tt:$1" - docker logout - #docker logout "$CI_REGISTRY" - ret1=$? - echo "Result from image deployment $ret1" - #docker run -v "$(pwd)/build:/home/etsi/dev/build" stf583-rf-validation:latest "bash" \ - # -c "/home/etsi/dev/robot/scripts/validate.sh $2" -else - ret1=0 -fi - -exit $ret && $ret1 - -- GitLab