From 53c3da13e21dd446352b621dfac0e4126cd0988c Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 13 Aug 2018 13:38:14 -0400 Subject: [PATCH] Refactor bifrost-integration-dhcp jobs Remove duplication of playbooks and legacy nodesets. Change-Id: Ib24da36d83939c6932edd1fd41539e2aaa4fdb1b Signed-off-by: Paul Belanger --- .../post.yaml | 15 ---- .../run.yaml | 72 ------------------ .../post.yaml | 15 ---- .../run.yaml | 73 ------------------- .../legacy/bifrost-integration-dhcp/post.yaml | 2 +- zuul.d/legacy-bifrost-jobs.yaml | 19 +++-- zuul.d/project.yaml | 2 +- 7 files changed, 11 insertions(+), 187 deletions(-) delete mode 100644 playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml delete mode 100644 playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml delete mode 100644 playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml delete mode 100644 playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml diff --git a/playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml b/playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml b/playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml deleted file mode 100644 index 5fa01bde2..000000000 --- a/playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml +++ /dev/null @@ -1,72 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-bifrost-integration-dhcp-centos-7 from old job gate-bifrost-integration-dhcp-centos-7-nv - roles: - - role: bindep - bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/bifrost'].src_dir }}" - - 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: | - set -u - set -e - set -x - cd $WORKSPACE - - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org \ - openstack/bifrost \ - openstack/diskimage-builder \ - openstack/ironic \ - openstack/python-ironicclient \ - openstack-infra/shade \ - openstack/ironic-inspector \ - openstack/python-ironic-inspector-client \ - openstack/requirements - export GIT_BASE=$(pwd) - export UPPER_CONSTRAINTS_FILE=$WORKSPACE/upper-constraints.txt - cd openstack/bifrost - scripts/test-bifrost-inventory-dhcp.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml b/playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml deleted file mode 100644 index e07f5510a..000000000 --- a/playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml +++ /dev/null @@ -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 diff --git a/playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml b/playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml deleted file mode 100644 index c7f3fd428..000000000 --- a/playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml +++ /dev/null @@ -1,73 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-bifrost-integration-dhcp-opensuse-423 from old job - gate-bifrost-integration-dhcp-opensuse-423-nv - roles: - - role: bindep - bindep_dir: "{{ ansible_user_dir }}/{{ zuul.projects['git.openstack.org/openstack/bifrost'].src_dir }}" - - 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: | - set -u - set -e - set -x - cd $WORKSPACE - - /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org \ - openstack/bifrost \ - openstack/diskimage-builder \ - openstack/ironic \ - openstack/python-ironicclient \ - openstack-infra/shade \ - openstack/ironic-inspector \ - openstack/python-ironic-inspector-client \ - openstack/requirements - export GIT_BASE=$(pwd) - export UPPER_CONSTRAINTS_FILE=$WORKSPACE/upper-constraints.txt - cd openstack/bifrost - scripts/test-bifrost-inventory-dhcp.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/bifrost-integration-dhcp/post.yaml b/playbooks/legacy/bifrost-integration-dhcp/post.yaml index e07f5510a..502ff570c 100644 --- a/playbooks/legacy/bifrost-integration-dhcp/post.yaml +++ b/playbooks/legacy/bifrost-integration-dhcp/post.yaml @@ -1,4 +1,4 @@ -- hosts: primary +- hosts: all tasks: - name: Copy files from {{ ansible_user_dir }}/workspace/ on node diff --git a/zuul.d/legacy-bifrost-jobs.yaml b/zuul.d/legacy-bifrost-jobs.yaml index 53427fba0..64601e1a6 100644 --- a/zuul.d/legacy-bifrost-jobs.yaml +++ b/zuul.d/legacy-bifrost-jobs.yaml @@ -34,21 +34,20 @@ post-run: playbooks/legacy/bifrost-integration-dhcp/post.yaml timeout: 7200 +- job: + name: bifrost-integration-dhcp-ubuntu-xenial + parent: bifrost-integration-dhcp + nodeset: ubuntu-xenial + - job: name: bifrost-integration-dhcp-centos-7 - parent: bifrost-integration - run: playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml - post-run: playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml - timeout: 7200 - nodeset: legacy-centos-7 + parent: bifrost-integration-dhcp + nodeset: centos-7 - job: name: bifrost-integration-dhcp-opensuse-423 - parent: bifrost-integration - run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml - post-run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml - timeout: 7200 - nodeset: legacy-opensuse-423 + parent: bifrost-integration-dhcp + nodeset: opensuse-423 - job: name: bifrost-integration-dibipa-debian diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 8aad154c3..3243ac0f8 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -4,7 +4,7 @@ - bifrost-integration-tinyipa - bifrost-integration-tinyipa-opensuse-423 # Non-voting jobs - - bifrost-integration-dhcp: + - bifrost-integration-dhcp-ubuntu-xenial: voting: false - bifrost-integration-dhcp-opensuse-423: voting: false