Commit 7e747af7 authored by Elian Kraja's avatar Elian Kraja
Browse files

CI/CD enhancements

parent 3fd13771
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -12,7 +12,18 @@ run_dir="$(pwd)"
echo "Using git branch $GIT_BRANCH"

bash ./scripts/build-container.sh
ret=$?
if [ "$ret" != "0" ]; then
     echo "build-container.sh failed"
     exit -1
fi

bash ./scripts/run-container.sh "${run_dir}"
ret=$?
if [ "$ret" != "0" ]; then
     echo "run-container.sh failed"
     exit -1
fi

if [[ "$GIT_BRANCH" =~ .*fix-plu$ ]]; then

+2 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ GET NSD Content with Range Request
    Set Headers    {"Range": "${range}"}
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
    Unset Headers  ["Range"]
    ${output}=    Output    response
    Set Suite Variable    ${response}    ${output}

@@ -397,6 +398,7 @@ GET NSD Content with invalid Range Request
    Set Headers    {"Range": "${erroneousRange}"}
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
    GET    ${apiRoot}/${apiName}/${apiVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
    Unset Headers  ["Range"]
    ${output}=    Output    response
    Set Suite Variable    ${response}    ${output}

+1 −1
Original line number Diff line number Diff line
FROM ubuntu:16.04
FROM ubuntu:18.04

MAINTAINER ETSI STF 583