From bb62b54b50d8c3b535e6a3dfa0f08c2877b704dc Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 26 Oct 2017 10:15:00 +0800
Subject: [PATCH] Remove migrated legacy puppet openstack check jobs
This patch removes the legacy-puppet-check-jobs that have been
migrated into the puppet-openstack-integration repository[1].
puppet modules switch to use new puppet-openstack-check jobs in
project-config repository[2]
[1] https://review.openstack.org/#/c/508296/
[2] https://review.openstack.org/#/c/508736/
Change-Id: Ib7054ddad8ed8e70dbe1ed7fd297acef162bb535
---
playbooks/legacy/puppet-module-build/run.yaml | 49 -------------------
zuul.d/zuul-legacy-jobs.yaml | 7 ---
zuul.d/zuul-legacy-project-templates.yaml | 32 ------------
3 files changed, 88 deletions(-)
delete mode 100644 playbooks/legacy/puppet-module-build/run.yaml
diff --git a/playbooks/legacy/puppet-module-build/run.yaml b/playbooks/legacy/puppet-module-build/run.yaml
deleted file mode 100644
index 1d178960..00000000
--- a/playbooks/legacy/puppet-module-build/run.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-puppet-module-build from old job gate-{name}-puppet-module-build
- tasks:
-
- - name: Ensure legacy workspace directory
- file:
- path: '{{ ansible_user_dir }}/workspace'
- state: directory
-
- - shell:
- cmd: |
- /usr/zuul-env/bin/zuul-cloner --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: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- if [ -f /usr/bin/yum ]; then
- sudo yum install -y https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm
- sudo yum install -y puppet-agent
- elif [ -f /usr/bin/apt-get ]; then
- wget https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb -O /tmp/puppet.deb
- sudo dpkg -i /tmp/puppet.deb
- sudo apt-get update
- sudo apt-get install puppet-agent
- rm -rf /tmp/puppet.deb
- fi
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- cd $ZUUL_PROJECT
- puppet module build .
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index d68cb8dc..56404ff2 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -5701,13 +5701,6 @@
timeout: 3600
nodeset: legacy-centos-7
-- job:
- name: legacy-puppet-module-build
- parent: legacy-base
- run: playbooks/legacy/puppet-module-build/run
- timeout: 3600
- files: ^metadata.json$
-
- job:
name: legacy-puppet-murano-puppet-beaker-rspec
parent: legacy-puppet-openstack-integration
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index eb370d74..54125d7f 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -435,38 +435,6 @@
- legacy-puppet-beaker-rspec:
voting: false
-- project-template:
- name: puppet-check-jobs
- check:
- jobs:
- - legacy-puppet-lint
- - legacy-puppet-syntax-3-legacy-centos-7
- - legacy-puppet-syntax-4-centos-7
- - legacy-puppet-module-build
- gate:
- queue: tripleo
- jobs:
- - legacy-puppet-lint
- - legacy-puppet-syntax-3-legacy-centos-7
- - legacy-puppet-syntax-4-centos-7
- - legacy-puppet-module-build
-
-- project-template:
- name: legacy-puppet-check-jobs
- check:
- jobs:
- - legacy-puppet-lint
- - legacy-puppet-syntax-3-legacy-centos-7
- - legacy-puppet-syntax-4-centos-7
- - legacy-puppet-module-build
- gate:
- queue: tripleo
- jobs:
- - legacy-puppet-lint
- - legacy-puppet-syntax-3-legacy-centos-7
- - legacy-puppet-syntax-4-centos-7
- - legacy-puppet-module-build
-
- project-template:
name: puppet-module-unit-jobs
check: