Build native v3 install-guide docs

Convert install-guide job and template to v3. This
runs only on newton and ocata.

Change-Id: Ide665a796bd80173b1e2248dfc8a7ad412c6c8bc
Depends-On: I85c101b83f745196bc6f8673c26f3864d61ff3f5
This commit is contained in:
Andreas Jaeger 2017-10-22 10:55:00 +02:00
parent 8e774bd22f
commit 8e72e62de1
6 changed files with 33 additions and 178 deletions

@ -1,10 +0,0 @@
- hosts: primary
tasks:
- name: Copy files from install-guide/build/html/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/install-guide/build/html/'
dest: '{{ zuul.executor.log_root }}/html/'
mode: pull
copy_links: true
verify_host: true

@ -1,129 +0,0 @@
- hosts: all
name: Autoconverted job legacy-install-guide from old job gate-{name}-install-guide
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
set -e
set -x
CLONEMAP=`mktemp`
REQS_DIR=`mktemp -d`
function cleanup {
mkdir -p $WORKSPACE
rm -rf $CLONEMAP $REQS_DIR
}
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: $ZUUL_PROJECT
dest: .
EOF
# zuul cloner works poorly if there are 2 names that are the
# same in here.
if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
cat >> $CLONEMAP << EOF
- name: openstack/requirements
dest: $REQS_DIR
EOF
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org $ZUUL_PROJECT openstack/requirements
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
fi
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -x
sudo rm -f /etc/sudoers.d/zuul
# Prove that general sudo access is actually revoked
! sudo -n true
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
VENV="install-guide"
GUIDEDIR="install-guide"
# This script is used to publish project-specific deploy-guide and
# install-guide documents to the proper place. Master will be
# published to a draft directory, stable/X will be published to the X
# directory. For example stable/newton documents will life in the
# newton directory.
# You need to pass in the following variables:
# VENV - virtual env to use
# GUIDEDIR - directory for building
if [ -z "$VENV" ] ; then
echo "The variable VENV is not set."
exit 1
fi
if [ -z "$GUIDEDIR" ] ; then
echo "The variable GUIDEDIR is not set."
exit 1
fi
export UPPER_CONSTRAINTS_FILE=$(pwd)/upper-constraints.txt
tox -e $VENV
[ -e .tox/$VENV/bin/pbr ] && freezecmd=pbr || freezecmd=pip
echo "Begin pbr freeze output from test virtualenv:"
echo "======================================================================"
.tox/${VENV}/bin/${freezecmd} freeze
echo "======================================================================"
MARKER_TEXT="Project: $ZUUL_PROJECT Ref: $ZUUL_REFNAME Build: $ZUUL_UUID Revision: $ZUUL_NEWREV"
echo $MARKER_TEXT > $GUIDEDIR/build/html/.root-marker
if [ -z "$ZUUL_REFNAME" ]; then
TARGET=""
# Leave documents where they are
elif [ "$ZUUL_REFNAME" == "master" ] ; then
TARGET=draft
elif echo $ZUUL_REFNAME | grep stable/ >/dev/null ; then
# Put stable release changes in dir named after stable release under the
# build dir. When Jenkins copies these files they will be accessible under
# the developer docs root using the name of the stable release.
TARGET=$(echo $ZUUL_REFNAME | sed 's/stable.//')
else
# Put other branch changes in dir named after branch under the
# build dir. When Jenkins copies these files they will be
# accessible under the developer docs root using the branch name.
# EG: feature/foo or milestone-proposed
TARGET=$ZUUL_REFNAME
fi
if [ ! -z $TARGET ] ; then
# Move the docs into subdir based on branch
TOP=`dirname $TARGET`
mv $GUIDEDIR/build/html $GUIDEDIR/build/tmp
mkdir -p $GUIDEDIR/build/html/$TOP
mv $GUIDEDIR/build/tmp $GUIDEDIR/build/html/$TARGET
fi
exit
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

@ -493,6 +493,27 @@
- bindep.txt
- other-requirements.txt
- job:
name: build-openstack-install-guide
parent: openstack-tox
description: |
Build install-guide document.
success-url: html/
post-run: playbooks/build-deploy-guide/post
timeout: 1800
vars:
tox_envlist: install-guide
# This job runs only pre-pike, with pike the documents have been
# integrated into normal builds.
branches:
- stable/newton
- stable/ocata
files:
- ^tox.ini$
- ^install-guide/.*
- bindep.txt
- other-requirements.txt
- job:
name: build-placement-api-ref
parent: openstack-tox

@ -644,3 +644,15 @@
post:
jobs:
- publish-deploy-guide
- project-template:
name: install-guide-jobs
check:
jobs:
- build-openstack-install-guide
gate:
jobs:
- build-openstack-install-guide
post:
jobs:
- publish-install-guide

@ -2646,20 +2646,6 @@
- openstack/kuryr
- openstack/kuryr-kubernetes
- job:
name: legacy-install-guide
parent: legacy-base
success-url: html/
run: playbooks/legacy/install-guide/run
post-run: playbooks/legacy/install-guide/post
timeout: 1800
branches: ^stable/(newton|ocata).*$
files:
- ^tox.ini$
- ^install-guide/.*
- bindep.txt
- other-requirements.txt
- job:
name: legacy-interop-tox-doc8
parent: legacy-base

@ -750,31 +750,6 @@
jobs:
- legacy-puppet-syntax-4-centos-7
- project-template:
name: install-guide-jobs
check:
jobs:
- legacy-install-guide:
branches: ^stable/(newton|ocata).*$
files:
- ^tox.ini$
- ^install-guide/.*
- bindep.txt
- other-requirements.txt
gate:
jobs:
- legacy-install-guide:
branches: ^stable/(newton|ocata).*$
files:
- ^tox.ini$
- ^install-guide/.*
- bindep.txt
- other-requirements.txt
post:
jobs:
- legacy-install-guide:
branches: ^stable/(newton|ocata).*$
- project-template:
name: integrated-gate
check: