From fc7a8c230fa73fd5b3853ee9d03e613544eeb262 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 13 Jul 2017 15:15:14 -0700 Subject: [PATCH] Update base-test to use new zuul-jobs roles This exercises the new base roles in zuul-jobs. It drops openstack-zuul-roles from the base-test job, as well as the workspace root variable which should no longer be needed. It also uses the new zuul_return method of reporting the log URL. Change-Id: I93ce94c4e40b44a1f7a5cf6c5a8521ab71da5a5a Depends-On: I7ac8d2335518c06808461f2fb30ea896709f09ed --- playbooks/base-test/post-logs.yaml | 32 ++++++++++++++++++++++++++++++ playbooks/base-test/post-ssh.yaml | 3 +++ playbooks/base-test/post.yaml | 2 -- playbooks/base-test/pre.yaml | 8 +++++++- zuul.yaml | 11 ++++++++-- 5 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 playbooks/base-test/post-logs.yaml create mode 100644 playbooks/base-test/post-ssh.yaml delete mode 100644 playbooks/base-test/post.yaml diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml new file mode 100644 index 0000000000..0bb3b550a4 --- /dev/null +++ b/playbooks/base-test/post-logs.yaml @@ -0,0 +1,32 @@ +- hosts: localhost + tasks: + - name: Add log server ssh key + command: ssh-add /var/lib/zuul/ssh/static_id_rsa + + - name: Add log server to inventory + add_host: + name: static.openstack.org + groups: zuul_logserver + ansible_user: jenkins + + - name: Add log server to known hosts + known_hosts: + name: static.openstack.org + key: static.openstack.org,23.253.108.137,2001:4800:7817:104:be76:4eff:fe05:dbee ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDcvLuGLagUAZfc0BThLus8ufSPCrIhDtG0BdXvhblJjvIbkuELD3dRWRZVSYZAdzGZRY3t6vTAcguTrkbQg5ngXfdfF+OKPkaH8DiZwAX/1g/iRXhInkZTGBVqHo9pLAMeNNwviSy2JjpTqdD6fLEkHwW+uw4E2YZhYivctTSbOepMkzAtFV0w5cpyBzjAT/Hax2x5un6es8R0Iw3AAnUmtapn5e5NCrg2rPNpd0nve84wUavvbC2DeGDOZQdnIahwo60Sder5ZE/x6cG39bkSDdgFQArAzrNrH6BHmNGjfFPpnGmfc7P8gQwDPtMf02HvKapqATXpIxdbSGimWLL + + - name: Copy inventory to logs dir + copy: + src: "{{ inventory_file }}" + dest: "{{ zuul.executor.log_root }}" + +- hosts: zuul_logserver + roles: + - upload-logs + +- hosts: localhost + tasks: + - name: Return log URL to Zuul + zuul_return: + data: + zuul: + log_url: "http://logs.openstack.org/{{ log_path }}" diff --git a/playbooks/base-test/post-ssh.yaml b/playbooks/base-test/post-ssh.yaml new file mode 100644 index 0000000000..d793838ce6 --- /dev/null +++ b/playbooks/base-test/post-ssh.yaml @@ -0,0 +1,3 @@ +- hosts: all + roles: + - remove-build-sshkey diff --git a/playbooks/base-test/post.yaml b/playbooks/base-test/post.yaml deleted file mode 100644 index fed9adf3a6..0000000000 --- a/playbooks/base-test/post.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- hosts: all - roles: [] diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml index fed9adf3a6..320c179df1 100644 --- a/playbooks/base-test/pre.yaml +++ b/playbooks/base-test/pre.yaml @@ -1,2 +1,8 @@ - hosts: all - roles: [] + roles: + - add-build-sshkey + - prepare-workspace + - role: validate-host + # TODO(mordred) When we have site-local variables, these should go there + zuul_traceroute_host: git.openstack.org + zuul_image_manifest: /etc/dib-builddate.txt diff --git a/zuul.yaml b/zuul.yaml index 78dc0e578d..7b3fd1bb55 100644 --- a/zuul.yaml +++ b/zuul.yaml @@ -54,9 +54,16 @@ description: | A job to test changes to the base job without disturbing the main job in production. Not for general use. - parent: base pre-run: playbooks/base-test/pre - post-run: playbooks/base-test/post + post-run: + - playbooks/base-test/post-ssh + - playbooks/base-test/post-logs + roles: + - zuul: openstack-infra/zuul-jobs + timeout: 1800 + nodes: + - name: ubuntu-xenial + label: ubuntu-xenial - project: name: openstack-infra/zuul-jobs