From 483d0fd89387c6f924dc518958ba3324d41797c2 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sun, 15 Oct 2017 16:37:26 -0400 Subject: [PATCH] Remove legacy-windmill jobs These have been moved into the windmill project. For now, we leave legacy-project-templates entried, until we are ready to do the project-template dance (this is a larger change). Change-Id: I6b1a2a9c5fbec5e8e7339340bc664c092a52e0d0 Depends-On: I7293f189f477de9bee3080ef21281017be319dbb Signed-off-by: Paul Belanger --- .../legacy/windmill-buildimages/run.yaml | 33 ----------------- .../legacy/windmill-deploy-centos-7/run.yaml | 33 ----------------- .../legacy/windmill-deploy-fedora-26/run.yaml | 33 ----------------- playbooks/legacy/windmill-deploy/run.yaml | 33 ----------------- zuul.d/zuul-legacy-jobs.yaml | 37 ------------------- zuul.d/zuul-legacy-project-templates.yaml | 18 ++++----- 6 files changed, 9 insertions(+), 178 deletions(-) delete mode 100644 playbooks/legacy/windmill-buildimages/run.yaml delete mode 100644 playbooks/legacy/windmill-deploy-centos-7/run.yaml delete mode 100644 playbooks/legacy/windmill-deploy-fedora-26/run.yaml delete mode 100644 playbooks/legacy/windmill-deploy/run.yaml diff --git a/playbooks/legacy/windmill-buildimages/run.yaml b/playbooks/legacy/windmill-buildimages/run.yaml deleted file mode 100644 index ffa0b746..00000000 --- a/playbooks/legacy/windmill-buildimages/run.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-windmill-buildimages from old job gate-windmill-buildimages-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: openstack/windmill - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org openstack/windmill - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/run-tox.sh buildimages - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/windmill-deploy-centos-7/run.yaml b/playbooks/legacy/windmill-deploy-centos-7/run.yaml deleted file mode 100644 index 80dfa12b..00000000 --- a/playbooks/legacy/windmill-deploy-centos-7/run.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-windmill-deploy-centos-7 from old job gate-windmill-deploy-centos-7-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: openstack/windmill - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org openstack/windmill - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/run-tox.sh deploy - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/windmill-deploy-fedora-26/run.yaml b/playbooks/legacy/windmill-deploy-fedora-26/run.yaml deleted file mode 100644 index 0d56904b..00000000 --- a/playbooks/legacy/windmill-deploy-fedora-26/run.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-windmill-deploy-fedora-26 from old job gate-windmill-deploy-fedora-26 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: openstack/windmill - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org openstack/windmill - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/run-tox.sh deploy - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/windmill-deploy/run.yaml b/playbooks/legacy/windmill-deploy/run.yaml deleted file mode 100644 index 9f34ea6b..00000000 --- a/playbooks/legacy/windmill-deploy/run.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-windmill-deploy from old job gate-windmill-deploy-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: openstack/windmill - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org openstack/windmill - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/run-tox.sh deploy - 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 d09a30d0..1cabe695 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -14581,43 +14581,6 @@ - openstack/vitrage - openstack/vitrage-dashboard -- job: - name: legacy-windmill-buildimages - parent: legacy-base - run: playbooks/legacy/windmill-buildimages/run - timeout: 3600 - required-projects: - - openstack/windmill - -- job: - name: legacy-windmill-deploy - parent: legacy-base - run: playbooks/legacy/windmill-deploy/run - timeout: 3600 - required-projects: - - openstack/windmill - voting: false - -- job: - name: legacy-windmill-deploy-centos-7 - parent: legacy-base - run: playbooks/legacy/windmill-deploy-centos-7/run - timeout: 3600 - nodeset: legacy-centos-7 - required-projects: - - openstack/windmill - voting: false - -- job: - name: legacy-windmill-deploy-fedora-26 - parent: legacy-base - run: playbooks/legacy/windmill-deploy-fedora-26/run - timeout: 3600 - nodeset: legacy-fedora-26 - required-projects: - - openstack/windmill - voting: false - - job: name: legacy-zaqar-tox-integration parent: legacy-base diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index e13508f8..9a460799 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -1456,46 +1456,46 @@ name: windmill-buildimages-xenial check: jobs: - - legacy-windmill-buildimages + - windmill-buildimages gate: jobs: - - legacy-windmill-buildimages + - windmill-buildimages - project-template: name: windmill-jobs-centos7-nv check: jobs: - - legacy-windmill-deploy-centos-7: + - windmill-deploy-centos-7: voting: false - project-template: name: windmill-jobs-fedora-26 check: jobs: - - legacy-windmill-deploy-fedora-26 + - windmill-deploy-fedora-26 gate: jobs: - - legacy-windmill-deploy-fedora-26 + - windmill-deploy-fedora-26 - project-template: name: windmill-jobs-fedora-26-nv check: jobs: - - legacy-windmill-deploy-fedora-26: + - windmill-deploy-fedora-26: voting: false - project-template: name: windmill-jobs-xenial check: jobs: - - legacy-windmill-deploy + - windmill-deploy gate: jobs: - - legacy-windmill-deploy + - windmill-deploy - project-template: name: windmill-jobs-xenial-nv check: jobs: - - legacy-windmill-deploy: + - windmill-deploy: voting: false