From 83edd3a996c506b6a1988d0c68214e9a849397d8 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 23 Oct 2014 15:13:36 +0200 Subject: controller: autoconfiscate First part of converting controller to autoconf/automake solution. * .gitignore: New gitignore; autotools ignores. * Makefile.am: New file. * get_machine: Renamed to template bin/dtf-get-machine.in. * bin/dtf-get-machine.in: New template based on get_machine. * run_remote: Renamed to template bin/dtf-run-remote.in. * bin/dtf-run-remote.in: New binary template from run_remote. * build: New bootstrap like helper script (git-only). * configure.ac: New file. * etc/dtf.sh.in: Likewise. * ansible_helpers/wait-for-ssh: Renamed to libexec/dtf-wait-for-ssh. * share/dtf-controller/parse_credsfile: Reworked script for parsing OS credentials. * parse_credsfile: Moved to share/dtf-controller. * libexec/dtf-wait-for-ssh: Renamed from wait-for-ssh. * ansible/*: Moved into share/dtf-controller/ansible/*. * share/dtf-controller/ansible/vars/generated-vars.yml.in: New template file exporting configure-time variables into playbooks. --- controller/ansible/dummy-wrapper.yml | 7 --- controller/ansible/fedora.yml | 64 ---------------------- controller/ansible/include/additional-packages.yml | 6 -- controller/ansible/include/beakerlib.yml | 1 - controller/ansible/include/download-results.yml | 5 -- controller/ansible/include/prepare-testenv.yml | 3 - controller/ansible/run_include | 19 ------- 7 files changed, 105 deletions(-) delete mode 100644 controller/ansible/dummy-wrapper.yml delete mode 100644 controller/ansible/fedora.yml delete mode 100644 controller/ansible/include/additional-packages.yml delete mode 100644 controller/ansible/include/beakerlib.yml delete mode 100644 controller/ansible/include/download-results.yml delete mode 100644 controller/ansible/include/prepare-testenv.yml delete mode 100755 controller/ansible/run_include (limited to 'controller/ansible') diff --git a/controller/ansible/dummy-wrapper.yml b/controller/ansible/dummy-wrapper.yml deleted file mode 100644 index 524b0ea..0000000 --- a/controller/ansible/dummy-wrapper.yml +++ /dev/null @@ -1,7 +0,0 @@ -- name: "dummy-wrapper" - hosts: "{{ target }}" - remote_user: root - gather_facts: False - - tasks: - - include: "{{ include_file }}" diff --git a/controller/ansible/fedora.yml b/controller/ansible/fedora.yml deleted file mode 100644 index cc64eac..0000000 --- a/controller/ansible/fedora.yml +++ /dev/null @@ -1,64 +0,0 @@ -- name: self-standing testsuite - remote_user: root - gather_facts: False - hosts: localhost - vars_files: - - "{{ opt_credsfile }}" - - tasks: - - name: generate builder name - local_action: shell echo `dd if=/dev/urandom bs=1k count=10 | md5sum ; echo DBTESTS` - register: vm_name - - - debug: msg="osusername={{ os_username }}" - - - name: spin it up - local_action: nova_compute auth_url={{os_auth_url}} - flavor_id={{os_flavor_id}} image_id="{{ os_image_id }}" key_name={{ os_keypair }} - login_password={{os_nova_password}} login_tenant_name="{{os_tenant_name}}" - login_username={{os_username}} security_groups={{os_security_group}} - wait=yes name="{{vm_name.stdout}}" wait_for=600 - register: nova - - - debug: msg="{{ nova.info.addresses }}" - - # This is ugly as hell... Hopefully nothing will be changing. - - local_action: command echo "{{ nova.info.addresses[os_network_dev][1].addr }}" - register: machine_ip - - - debug: msg="{{ machine_ip.stdout }}" - - - name: wait for the host to be hot - local_action: wait_for host={{ machine_ip.stdout }} port=22 delay=5 timeout=600 - - - local_action: shell ../ansible_helpers/wait-for-ssh "root@{{ machine_ip.stdout }}" - - - name: add it to the special group - local_action: add_host hostname={{ machine_ip.stdout }} - groupname=temp_group - -- hosts: temp_group - user: root - gather_facts: False - tasks: - - copy: src={{ opt_workdir }}/{{ opt_testsuite_name }}.tar.gz - dest=/root/{{ opt_testsuite_name }}.tar.gz - - - include: include/beakerlib.yml - - - include: include/prepare-testenv.yml - - - include: include/additional-packages.yml - when: dtf_rpm_files_list is defined - - - shell: cd /root && tar -xf {{ opt_testsuite_name }}.tar.gz - - - shell: cd /root/{{ opt_testsuite_name }}&& ./run &>/var/tmp/dtf-run.overview - register: test_result - ignore_errors: yes - - - include: include/download-results.yml - - - name: stop the vm - shell: echo "not implemented yet" - when: test_result.rc == 0 diff --git a/controller/ansible/include/additional-packages.yml b/controller/ansible/include/additional-packages.yml deleted file mode 100644 index f821255..0000000 --- a/controller/ansible/include/additional-packages.yml +++ /dev/null @@ -1,6 +0,0 @@ -- local_action: shell cat "{{ dtf_rpm_files_list }}" | xargs -n 100 - register: additional_packages - -- debug: msg="{{ additional_packages.stdout }}" - -- shell: yum install -y {{ additional_packages.stdout }} diff --git a/controller/ansible/include/beakerlib.yml b/controller/ansible/include/beakerlib.yml deleted file mode 100644 index 0461f25..0000000 --- a/controller/ansible/include/beakerlib.yml +++ /dev/null @@ -1 +0,0 @@ -- yum: conf_file=https://beaker-project.org/yum/beaker-server-Fedora.repo state=present name=beakerlib diff --git a/controller/ansible/include/download-results.yml b/controller/ansible/include/download-results.yml deleted file mode 100644 index 4404e08..0000000 --- a/controller/ansible/include/download-results.yml +++ /dev/null @@ -1,5 +0,0 @@ -- shell: cp -f /var/tmp/dtf-run.overview /var/tmp/dtf/ - -- shell: cd /var/tmp ; tar -czf dtf.tar.gz dtf - -- fetch: src=/var/tmp/dtf.tar.gz dest="{{ opt_workdir }}/" flat=yes diff --git a/controller/ansible/include/prepare-testenv.yml b/controller/ansible/include/prepare-testenv.yml deleted file mode 100644 index a63e51a..0000000 --- a/controller/ansible/include/prepare-testenv.yml +++ /dev/null @@ -1,3 +0,0 @@ -- yum: state=present name=postgresql-server - -- yum: state=present name=postgresql-upgrade diff --git a/controller/ansible/run_include b/controller/ansible/run_include deleted file mode 100755 index 4e84c7d..0000000 --- a/controller/ansible/run_include +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -export ANSIBLE_HOST_KEY_CHECKING=False - -workdir="$(dirname "${BASH_SOURCE[0]}")" -workdir=$(readlink -f "$workdir") - -export playbook=$(readlink -f "$1") - -( set -x - cd "$workdir" - - ansible-playbook -i "$workdir/../config/hosts" \ - --extra-vars "include_file=$playbook" \ - --extra-vars "script_name=dummy" \ - --extra-vars "opt_workdir=/tmp/dtf-$(date +%H%M%S%N)" \ - --extra-vars "target=host" \ - "dummy-wrapper.yml" -) -- cgit