From dfce36da0f24bdeada0b1ecf9cd65f0b10d15461 Mon Sep 17 00:00:00 2001 From: Valerij Maljulin Date: Jan 20 2021 12:39:49 +0000 Subject: Fix pipeline script for publishing docs JIRA: RHELWF-2652 --- diff --git a/.gitignore b/.gitignore index a0d039f..cb09477 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ conf/settings.py .cache /build/ docs/_build +docs-on-pagure /rpmbuild-output/ *.src.rpm .tox diff --git a/openshift/pipelines/snippets/waiverdb-build-and-test.groovy b/openshift/pipelines/snippets/waiverdb-build-and-test.groovy index 9b8336b..c8fa8a2 100644 --- a/openshift/pipelines/snippets/waiverdb-build-and-test.groovy +++ b/openshift/pipelines/snippets/waiverdb-build-and-test.groovy @@ -56,7 +56,7 @@ stage('Build Artifacts') { stage('Publish Docs') { when { expression { - return "${params.PAGURE_DOC_REPO_NAME}" && (env.GIT_REPO_REF == params.PAGURE_MAIN_BRANCH || env.FORCE_PUBLISH_DOCS == "true") + return (env.GIT_REPO_REF == "master" || env.FORCE_PUBLISH_DOCS == "true") } } steps { @@ -67,7 +67,7 @@ stage('Build Artifacts') { ssh-keygen -R pagure.io echo 'pagure.io ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC198DWs0SQ3DX0ptu+8Wq6wnZMrXUCufN+wdSCtlyhHUeQ3q5B4Hgto1n2FMj752vToCfNTn9mWO7l2rNTrKeBsELpubl2jECHu4LqxkRVihu5UEzejfjiWNDN2jdXbYFY27GW9zymD7Gq3u+T/Mkp4lIcQKRoJaLobBmcVxrLPEEJMKI4AJY31jgxMTnxi7KcR+U5udQrZ3dzCn2BqUdiN5dMgckr4yNPjhl3emJeVJ/uhAJrEsgjzqxAb60smMO5/1By+yF85Wih4TnFtF4LwYYuxgqiNv72Xy4D/MGxCqkO/nH5eRNfcJ+AJFE7727F7Tnbo4xmAjilvRria/+l' >>~/.ssh/known_hosts rm -rf docs-on-pagure - git clone ssh://git@pagure.io/docs/${params.PAGURE_DOC_REPO_NAME}.git docs-on-pagure + git clone ssh://git@pagure.io/docs/waiverdb.git docs-on-pagure rm -rf docs-on-pagure/* cp -r docs/_build/html/* docs-on-pagure/ cd docs-on-pagure