Commit d3d21835 authored by Naum Spaseski's avatar Naum Spaseski
Browse files

Updated docker logout + rename variables

parent 7b3546af

specifications/generateCR/generate_changemarks.sh

+18 −20
Original line number Diff line number Diff line
@@ -14,23 +14,23 @@ GENERATE_CHANGEMARKS_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/gen 


#Parameters



#${CI_PROJECT_URL} -> 1

echo "CI_PROJECT_URL:" $1

#${CI_MERGE_REQUEST_PROJECT_ID} -> 2

echo "CI_MERGE_REQUEST_PROJECT_ID:" $2

#${CI_MERGE_REQUEST_IID} -> 3

echo "CI_MERGE_REQUEST_IID:" $3

#${data_start_delimiter} -> 4

echo "data_start_delimiter:" $4

#${data_coversheet_template} -> 5

echo "data_coversheet_template:" $5

#"$SPECIFICATIONS_PIPELINE_TOKEN" -> 6

echo "SPECIFICATIONS_PIPELINE_TOKEN:" $6

PROJECT_URL=$1

echo "CI_PROJECT_URL:" $PROJECT_URL

PROJECT_ID=$2

echo "PROJECT_ID:" $PROJECT_ID

MERGE_REQUEST_IID=$3

echo "MERGE_REQUEST_IID:" $MERGE_REQUEST_IID

DATA_START_DELIMITER=$4

echo "DATA_START_DELIMITER:" $DATA_START_DELIMITER

DATA_COVERSHEET_TEMPLATE=$5

echo "DATA_COVERSHEET_TEMPLATE:" $DATA_COVERSHEET_TEMPLATE

SPECIFICATIONS_ACCESS_TOKEN=$6

echo "SPECIFICATIONS_ACCESS_TOKEN:" $SPECIFICATIONS_ACCESS_TOKEN



echo "\n------ Checking for docker image --------"

echo "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" | cut -d "/" -f 1 | docker logout 

docker logout $(echo "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" | cut -d "/" -f 1 )

docker pull "$GENERATE_CHANGEMARKS_DOCKER_IMAGE"

echo "$FORGELIB_DOCKER_IMAGE" | cut -d "/" -f 1 | docker logout 

docker logout $(echo "$FORGELIB_DOCKER_IMAGE" | cut -d "/" -f 1 )

docker pull "$FORGELIB_DOCKER_IMAGE"
@@ -40,17 +40,15 @@ rm out/*.md 


echo "------ Parsing repo URL --------"



HOST_URL=$(echo $1 | cut -d'/' -f 1-4)

PROJECT_NAME=$(echo $1 | grep -o '[^/]*$' | cut -d'.' -f 1)

HOST_URL=$(echo $PROJECT_URL | cut -d'/' -f 1-4)

PROJECT_NAME=$(echo $PROJECT_URL | grep -o '[^/]*$' | cut -d'.' -f 1)

echo "HOST URL:" $HOST_URL

echo "PROJECT NAME:" $PROJECT_NAME

echo "PROJECT ID:" $2

echo "MERGE IID:" $3



echo "\n------ Generating change marks MD --------"

docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" changemarks -o "/tmp/out" "$HOST_URL" "$2" "$3"

docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w /tmp "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" changemarks -o "out" -t $SPECIFICATIONS_ACCESS_TOKEN "$HOST_URL" "$PROJECT_ID" "$MERGE_REQUEST_IID"



echo "\n------ Generating CR with git diff --------"

docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv --combine --diffs --linenumbers --extension "png" --extension "jpg" --extension "svg" --extension "md" --preprocessor data --token ${6} --outPath=docs/ --startdelimiter "$4" --coversheet "$5" "$HOST_URL" "$2" "$3"

docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv --combine --diffs --linenumbers --extension "png" --extension "jpg" --extension "svg" --extension "md" --preprocessor data --token ${SPECIFICATIONS_ACCESS_TOKEN} --outPath=docs/ --startdelimiter "$DATA_START_DELIMITER" --coversheet "$DATA_COVERSHEET_TEMPLATE" "$HOST_URL" "$PROJECT_ID" "$MERGE_REQUEST_IID"



exit 0