diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 02d09212ba..d1e527a781 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -5220,6 +5220,7 @@ - puppet-beaker-jobs-centos7: job-suffix: '' branch-override: default + - '{name}-tarball' - project: name: puppet-apparmor diff --git a/jenkins/scripts/run-tarball.sh b/jenkins/scripts/run-tarball.sh index 7a5de5e8f5..ef983ac189 100755 --- a/jenkins/scripts/run-tarball.sh +++ b/jenkins/scripts/run-tarball.sh @@ -14,12 +14,25 @@ # License for the specific language governing permissions and limitations # under the License. -venv=${1:-venv} +# this is a puppet module +if [ -r metadata.json ]; then + MODULE_NAME=$(basename `git rev-parse --show-toplevel`) + puppet module build . + # so we can re-use "tarball" publisher + mv pkg dist + if [ -z "$ZUUL_REFNAME" ] || [ "$ZUUL_REFNAME" == "master" ]; then + mv dist/*.tar.gz dist/$MODULE_NAME-master.tar.gz + # need to figure how to deal with stable branches + fi +else +# this a python project + venv=${1:-venv} -export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt + export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt -rm -f dist/*.tar.gz -tox -e$venv python setup.py sdist + rm -f dist/*.tar.gz + tox -e$venv python setup.py sdist +fi FILES=dist/*.tar.gz for f in $FILES; do diff --git a/zuul/layout.yaml b/zuul/layout.yaml index bd9032b0c4..87b506aecf 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -8999,6 +8999,8 @@ projects: - name: puppet-openstack-integration-jobs-scenario001 check-tripleo: - gate-tripleo-ci-f22-nonha + post: + - puppet-aodh-tarball - name: openstack/puppet-autossh template: