Commit 84c454ab authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Using CI_PROJECT_NAME as working dir for the autogenerated openapi

parent f65c04ac

common-openapi/.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -77,16 +77,16 @@ Generation of OpenAPI: 
    - |

     curl --header "PRIVATE-TOKEN: $PIPELINE_PROJECT_TOKEN" "${CI_API_V4_URL}/projects/694/repository/files/common-openapi%2FgenerateOpenapi%2Esh/raw?ref=autogeneration" >> generateOpenapi.sh

    - chmod +x generateOpenapi.sh

    - git clone "https://oauth2:$PIPELINE_ACCESS_TOKEN@$CI_SERVER_HOST/rep/$CI_PROJECT_PATH.git"

    - git clone "https://oauth2:$PIPELINE_ACCESS_TOKEN@$CI_SERVER_HOST/rep/$CI_PROJECT_PATH.git" ${CI_PROJECT_NAME}

  script: 

    - echo 'Generate OpenAPI'

    - ./generateOpenapi.sh .

    - ./generateOpenapi.sh ${CI_PROJECT_NAME}

  after_script:

    - echo $CI_COMMIT_BRANCH

    - echo $CI_PROJECT_PATH

    - echo $CI_SERVER_HOST

    - echo $(pwd)

    - cd gs012-rnis-api

    - cd ${CI_PROJECT_NAME}

    - |

     git push --push-option="ci.skip" "https://gitlab-ci-token:$PIPELINE_ACCESS_TOKEN@$CI_SERVER_HOST/rep/$CI_PROJECT_PATH.git"

    - |

common-openapi/generateOpenapi.sh

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ echo -e "\nimport main" | tee -a "command.py" 
echo -e "\nif __name__ == '__main__':" | tee -a "command.py"

echo -e "\n    sys.exit(main.maindoc2oas(\"/app/tmp/$spec\", \"/app/tmp/$config\"))" | tee -a "command.py"

#docker run --rm -v $(pwd):/app/tmp $DOC2OAS_DOCKER_IMAGE "-c 'import main; main.maindoc2oas("/app/doc/$spec", "/app/doc/$config")'"

docker run --rm -v $(pwd):/app/tmp doc2oas-ie-sample:master tmp/command.py

docker run --rm -v $(pwd):/app/tmp $DOC2OAS_DOCKER_IMAGE tmp/command.py



echo "------ Move generated openapi to the correct folder --------"
@@ -43,11 +43,11 @@ if [ -z $openapi ] ; then 
    exit 0

else 

    #mv $openapi ../autogenerated/$openapi

	mv $openapi ../gs012-rnis-api/autogenerated/$openapi

	mv $openapi ../$1/autogenerated/$openapi

fi



cd .. 

cd gs012-rnis-api

cd $1



echo "\n------ Prepare to push -------"

git add autogenerated/$openapi