Remove trusty beaker job template
The only project that was using this template was puppet-infracloud, which doesn't really need it. Clean up the template, the job and the supporting playbooks to make migrating the beaker jobs to zuulv3 easier. Depends-On: https://review.openstack.org/571024 Change-Id: I4df3fb0207cf421656a6e6b62712ed6abbcea0ad
This commit is contained in:
Colleen Murphy
parent
47bfe73cb1
commit
34f2e10a94
|
|
@ -1,15 +0,0 @@
|
|||
- hosts: primary
|
||||
tasks:
|
||||
|
||||
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
|
||||
synchronize:
|
||||
src: '{{ ansible_user_dir }}/workspace/'
|
||||
dest: '{{ zuul.executor.log_root }}'
|
||||
mode: pull
|
||||
copy_links: true
|
||||
verify_host: true
|
||||
rsync_opts:
|
||||
- --include=/logs/**
|
||||
- --include=*/
|
||||
- --exclude=*
|
||||
- --prune-empty-dirs
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
- hosts: all
|
||||
name: Autoconverted job legacy-puppet-beaker-rspec-ubuntu-trusty from old job gate-{name}-puppet-beaker-rspec-ubuntu-trusty-nv
|
||||
roles:
|
||||
- bindep
|
||||
|
||||
tasks:
|
||||
|
||||
- name: Ensure legacy workspace directory
|
||||
file:
|
||||
path: '{{ ansible_user_dir }}/workspace'
|
||||
state: directory
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
CLONEMAP=`mktemp`
|
||||
function cleanup {
|
||||
# In cases where zuul-cloner is aborted during a git
|
||||
# clone operation, git will remove the git work tree in
|
||||
# its cleanup. The work tree in these jobs is the
|
||||
# workspace directory, which means that subsequent
|
||||
# jenkins post-build actions can not run because the
|
||||
# workspace has been removed.
|
||||
# To reduce the likelihood of this having an impact,
|
||||
# recreate the workspace directory if needed
|
||||
mkdir -p $WORKSPACE
|
||||
rm -f $CLONEMAP
|
||||
}
|
||||
trap cleanup EXIT
|
||||
cat > $CLONEMAP << EOF
|
||||
clonemap:
|
||||
- name: $ZUUL_PROJECT
|
||||
dest: .
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
|
||||
git://git.openstack.org $ZUUL_PROJECT
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
ZUUL_BRANCH_REAL=${ZUUL_BRANCH:-master}
|
||||
# Workaround for puppet-ceph, where we need to checkout
|
||||
# puppet-openstack-integration from stable/pike when working on
|
||||
# stable/jewel.
|
||||
# Ceph Jewel works with Newton to Pike
|
||||
if [[ "$ZUUL_BRANCH" == "stable/jewel" ]]; then
|
||||
ZUUL_BRANCH_REAL='stable/pike'
|
||||
fi
|
||||
export ZUUL_REF=${ZUUL_REF:-None}
|
||||
CLONEMAP=`mktemp`
|
||||
function cleanup {
|
||||
rm -f $CLONEMAP
|
||||
}
|
||||
trap cleanup EXIT
|
||||
cat > $CLONEMAP << EOF
|
||||
clonemap:
|
||||
- name: openstack/puppet-openstack-integration
|
||||
dest: puppet-openstack-integration
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
|
||||
--cache-dir /opt/git \
|
||||
--zuul-branch $ZUUL_BRANCH_REAL \
|
||||
git://git.openstack.org openstack/puppet-openstack-integration
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
set -e
|
||||
set -x
|
||||
if [ -f /usr/bin/yum ]; then
|
||||
sudo yum -y remove rdo-release "centos-release-openstack-*" "centos-release-ceph-*"
|
||||
sudo yum -y install libxml2-devel libxslt-devel ruby-devel zlib-devel
|
||||
sudo yum -y groupinstall "Development Tools"
|
||||
# Uninstall python-requests from pip, since we install it in
|
||||
# system-config/install_puppet.sh
|
||||
sudo pip uninstall requests -y || true
|
||||
elif [ -f /usr/bin/apt-get ]; then
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libxml2-dev libxslt-dev ruby-dev zlib1g-dev
|
||||
fi
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
echo "" | sudo tee -a /etc/ssh/sshd_config
|
||||
echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
|
||||
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
|
||||
echo "" | sudo tee -a /etc/ssh/sshd_config
|
||||
echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
|
||||
echo " PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
|
||||
mkdir -p .ssh
|
||||
ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
|
||||
sudo mkdir -p /root/.ssh
|
||||
cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
|
||||
if [ -f /usr/bin/yum ]; then
|
||||
sudo systemctl reload sshd
|
||||
elif [ -f /usr/bin/apt-get ]; then
|
||||
sudo service ssh restart
|
||||
fi
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
||||
- shell:
|
||||
cmd: |
|
||||
trap "puppet-openstack-integration/copy_logs.sh" EXIT
|
||||
mkdir .bundled_gems
|
||||
export GEM_HOME=`pwd`/.bundled_gems
|
||||
gem install bundler --no-rdoc --no-ri --verbose
|
||||
$GEM_HOME/bin/bundle install --retry 3
|
||||
export BEAKER_set=nodepool-trusty
|
||||
export BEAKER_debug=yes
|
||||
export BEAKER_color=no
|
||||
$GEM_HOME/bin/bundle exec rspec spec/acceptance
|
||||
executable: /bin/bash
|
||||
chdir: '{{ ansible_user_dir }}/workspace'
|
||||
environment: '{{ zuul | zuul_legacy_vars }}'
|
||||
|
|
@ -1816,16 +1816,6 @@
|
|||
post-run: playbooks/legacy/puppet-beaker-rspec-centos-7/post.yaml
|
||||
nodeset: legacy-centos-7
|
||||
|
||||
- job:
|
||||
name: legacy-puppet-beaker-rspec-ubuntu-trusty
|
||||
parent: legacy-puppet-openstack-integration
|
||||
run: playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/run.yaml
|
||||
post-run: playbooks/legacy/puppet-beaker-rspec-ubuntu-trusty/post.yaml
|
||||
timeout: 3600
|
||||
nodeset: legacy-ubuntu-trusty
|
||||
required-projects:
|
||||
- openstack/puppet-openstack-integration
|
||||
|
||||
- job:
|
||||
name: legacy-puppet-httpd-forge-upload
|
||||
parent: legacy-base
|
||||
|
|
|
|||
|
|
@ -127,13 +127,6 @@
|
|||
jobs:
|
||||
- legacy-puppet-beaker-rspec-centos-7
|
||||
|
||||
- project-template:
|
||||
name: puppet-beaker-jobs-trusty-nv
|
||||
check:
|
||||
jobs:
|
||||
- legacy-puppet-beaker-rspec-ubuntu-trusty:
|
||||
voting: false
|
||||
|
||||
- project-template:
|
||||
name: puppet-beaker-jobs-xenial
|
||||
check:
|
||||
|
|
|
|||
Loading…
Reference in New Issue