@@ -243,10 +243,13 @@ pipeline:
243243 spec :
244244 connectorRef : account.harbor
245245 image : harbor.devops.indico.io/dockerhub-proxy/alpine/git
246- shell : Bash
246+ shell : Sh
247247 command : |-
248248 TARGET_BRANCH="<+codebase.branch>"
249- COMMIT_MESSAGE="<+codebase.commitMessage>"
249+ COMMIT_MESSAGE=$(cat <<'EOF'
250+ <+codebase.commitMessage>
251+ EOF
252+ )
250253 MODIFIED_COMMIT_MESSAGE=$(echo "${COMMIT_MESSAGE}" | head -n 1)
251254 COMMITTER="<+codebase.gitUser>"
252255
@@ -269,15 +272,16 @@ pipeline:
269272 shell : Sh
270273 command : |-
271274 #!/bin/bash
272- TAG="<+trigger.tag>"
275+ TAG="<+codebase.tag>"
276+ apt-get update && apt-get install -y git
273277 git fetch origin tag $TAG
274278 rm -rf /indico-client/dist
275279 pip3 install twine==3.3.0
276280 python3 setup.py sdist
277- echo "checking dist files at '. dist/*'"
278- twine check . dist/*
281+ echo "checking dist files at 'dist/*'"
282+ twine check dist/*
279283 echo "uploading pre-release ${TAG}"
280- twine upload -u __token__ -p <+stage.variables.pypi_token> . dist/*
284+ twine upload -u __token__ -p <+stage.variables.pypi_token> dist/*
281285 when :
282286 stageStatus : Success
283287 condition : <+pipeline.variables.RUN_PRERELEASE> == "TRUE"
@@ -287,19 +291,20 @@ pipeline:
287291 identifier : publish_release
288292 spec :
289293 connectorRef : account.harbor
290- image : harbor.devops.indico.io/indico/<+pipeline.variables.service>:<+pipeline.stages.build_info.spec.execution.steps.build_info.output.outputVariables.TEST_IMAGE_TAG >
294+ image : harbor.devops.indico.io/indico/<+pipeline.variables.service>:<+pipeline.stages.build_info.spec.execution.steps.build_info.output.outputVariables.IMAGE_TAG >
291295 shell : Sh
292296 command : |-
293297 #!/bin/bash
294- TAG="<+trigger.tag>"
298+ TAG="<+codebase.tag>"
299+ apt-get update && apt-get install -y git
295300 git fetch origin tag $TAG
296301 rm -rf /indico-client/dist
297302 pip3 install twine==3.3.0
298303 python3 setup.py sdist
299- echo "checking dist files at '. dist/*'"
300- twine check . dist/*
304+ echo "checking dist files at 'dist/*'"
305+ twine check dist/*
301306 echo "uploading release ${TAG}"
302- twine upload -u __token__ -p <+stage.variables.pypi_token> . dist/*
307+ twine upload -u __token__ -p <+stage.variables.pypi_token> dist/*
303308 when :
304309 stageStatus : Success
305310 condition : <+pipeline.variables.RUN_RELEASE> == "TRUE"
0 commit comments