From 5268c1ed3fb9816022618ef02995300a6221d98e Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 20 Nov 2014 09:45:15 +0100 Subject: controller: make the system setup configurable Add the --setup-playbook option for dtf-run-remote which allows us to submit configuration (or any) playbook which will be included into the default one, executed before actual testing. * controller/Makefile.am: s/fedora.yml/default.yml/. * controller/bin/dtf-controller.in: Call dtf-remote-run with --setup-playbook option. * controller/bin/dtf-run-remote.in: Fix the option parsing. Add new option --setup-playbook. (error): New function. (die): Use '$*' instead of '*@'. * controller/share/dtf-controller/ansible/playbooks/fedora.yml: Rename to default.yml. * controller/share/dtf-controller/ansible/playbooks/default.yml: Moved from fedora.yml. * controller/share/--/--/playbooks/include/prepare-testenv.yml: Removed hard-wired configuration. --- controller/Makefile.am | 5 +- controller/bin/dtf-controller.in | 1 + controller/bin/dtf-run-remote.in | 72 +++++++++++++++------- .../dtf-controller/ansible/playbooks/default.yml | 56 +++++++++++++++++ .../dtf-controller/ansible/playbooks/fedora.yml | 55 ----------------- .../ansible/playbooks/include/prepare-testenv.yml | 3 - 6 files changed, 108 insertions(+), 84 deletions(-) create mode 100644 controller/share/dtf-controller/ansible/playbooks/default.yml delete mode 100644 controller/share/dtf-controller/ansible/playbooks/fedora.yml delete mode 100644 controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml diff --git a/controller/Makefile.am b/controller/Makefile.am index e271af9..b35357c 100644 --- a/controller/Makefile.am +++ b/controller/Makefile.am @@ -26,7 +26,7 @@ ansibleplaybooksdir = $(pkgdatadir)/ansible/playbooks ansiblevars_DATA = share/dtf-controller/ansible/vars/generated-vars.yml dtfplaybookdir = $(pkgdatadir)/ansible/playbooks -ansibleplaybooks_DATA = $(srcdir)/share/dtf-controller/ansible/playbooks/fedora.yml +ansibleplaybooks_DATA = $(srcdir)/share/dtf-controller/ansible/playbooks/default.yml resulttemplatedir = $(pkgdatadir)/results-stats-templates resulttemplate_DATA = $(srcdir)/share/dtf-controller/results-stats-templates/html.tmpl @@ -83,9 +83,8 @@ CONTROLLERDATA = \ $(srcdir)/share/dtf-controller/ansible/run_include \ $(srcdir)/share/dtf-controller/ansible/playbooks/include/beakerlib.yml \ $(srcdir)/share/dtf-controller/ansible/playbooks/include/additional-packages.yml \ - $(srcdir)/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml \ $(srcdir)/share/dtf-controller/ansible/playbooks/include/download-results.yml \ - $(srcdir)/share/dtf-controller/ansible/playbooks/fedora.yml \ + $(srcdir)/share/dtf-controller/ansible/playbooks/default.yml \ $(srcdir)/share/dtf-controller/ansible/dummy-wrapper.yml diff --git a/controller/bin/dtf-controller.in b/controller/bin/dtf-controller.in index 0c80ef5..a231270 100644 --- a/controller/bin/dtf-controller.in +++ b/controller/bin/dtf-controller.in @@ -71,6 +71,7 @@ sub child_task '--workdir', $dir, '--distro', $run->{distro}, '--distro-version', $run->{distro_version}, + '--setup-playbook', $run->{setup_playbook}, ], "$dir/dtf-run-remote.out", "$dir/dtf-run-remote.err"; diff --git a/controller/bin/dtf-run-remote.in b/controller/bin/dtf-run-remote.in index b83b79c..14f81a4 100644 --- a/controller/bin/dtf-run-remote.in +++ b/controller/bin/dtf-run-remote.in @@ -2,9 +2,7 @@ . "@sysconfdir@/dtf.sh" || exit 1 -longopts="verbose,help,force,testid:,listonly" - -run_playbook=${run_playbook-@ansibleplaybooksdir@/fedora.yml} +run_playbook=${run_playbook-@ansibleplaybooksdir@/default.yml} opt_workdir= opt_distro=fedora @@ -12,26 +10,31 @@ opt_openstack_instance="$DTF_OPENSTACK_DEFAULT_ID" opt_distro_ver=20 opt_extra_rpms= opt_taskdir= +opt_setup_playbook= +opt_help=false -die() { echo >&2 "$@" ; exit 1 ; } +die() { echo >&2 "$*" ; exit 1 ; } +error() { echo >&2 "$*" ; } -longopts="distro:,distro-version:,workdir:,openstack-instance:,extra-rpms-file:" -longopts+=",taskdir:" +longopts="help" +longopts+=",distro:,distro-version:,workdir:,openstack-instance:,extra-rpms-file:" +longopts+=",taskdir:,setup-playbook:" ARGS=$(getopt -o "v" -l "$longopts" -n "getopt" -- "$@") \ || exit 1 eval set -- "$ARGS" while true; do case "$1" in - --taskdir) + --taskdir|--setup-playbook|--distro|--openstack-instance|--workdir) opt=$(sed -e 's/^--//' -e 's/[^[a-zA-Z0-9]/_/g'<<<"$1") eval "opt_$opt=\"${2,,}\"" shift 2 ;; - --distro) - opt_distro="$2" - shift 2 + --help) + opt=$(sed -e 's/^--//' -e 's/[^[a-zA-Z0-9]/_/g'<<<"$1") + eval "opt_$opt=true" + shift ;; --distro-version) @@ -39,17 +42,6 @@ while true; do shift 2 ;; - --openstack-instance) - opt_openstack_instance="$2" - shift 2 - ;; - - --workdir) - # where the remote results are fetched into - opt_workdir="$2" - shift 2 - ;; - --extra-rpms-file) opt_extra_rpms="$(readlink -f "$2")" shift 2 @@ -68,8 +60,41 @@ while true; do esac done -test -z "$opt_openstack_instance" && die "option --openstack-instance=ID not used" -test -z "$opt_taskdir" && die "you must specify --taskdir" +$opt_help && { +cat </var/tmp/dtf-run.overview + register: test_result + ignore_errors: yes + + - include: "{{ config_ansibleplaybooksdir }}/include/download-results.yml" + + - name: stop the vm + local_action: shell "{{ config_bindir }}/dtf-return-machine" {{ inventory_hostname }} + when: test_result.rc == 0 diff --git a/controller/share/dtf-controller/ansible/playbooks/fedora.yml b/controller/share/dtf-controller/ansible/playbooks/fedora.yml deleted file mode 100644 index ea39e70..0000000 --- a/controller/share/dtf-controller/ansible/playbooks/fedora.yml +++ /dev/null @@ -1,55 +0,0 @@ -- name: self-standing testsuite - remote_user: root - gather_facts: False - hosts: localhost - vars_files: - - "{{ opt_generated_vars }}" - - tasks: - - name: generate builder name - local_action: shell echo `dd if=/dev/urandom bs=1k count=10 | md5sum ; echo DBTESTS` - register: vm_name - - - local_action: shell {{ config_bindir }}/dtf-get-machine - --distro {{ opt_distro }} --distro-version {{ opt_distro_ver }} - --quiet --name "{{ vm_name.stdout }}" - register: machine_ip - - - debug: var=machine_ip - - - 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 {{ config_libexecdir }}/dtf-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 - vars_files: - - "{{ opt_generated_vars }}" - tasks: - - copy: src={{ opt_workdir }}/{{ opt_testsuite_name }}.tar.gz - dest=/root/{{ opt_testsuite_name }}.tar.gz - - - include: "{{ config_ansibleplaybooksdir }}/include/beakerlib.yml" - - - include: "{{ config_ansibleplaybooksdir }}/include/prepare-testenv.yml" - - - include: "{{ config_ansibleplaybooksdir }}/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 --force &>/var/tmp/dtf-run.overview - register: test_result - ignore_errors: yes - - - include: "{{ config_ansibleplaybooksdir }}/include/download-results.yml" - - - name: stop the vm - local_action: shell "{{ config_bindir }}/dtf-return-machine" {{ inventory_hostname }} - when: test_result.rc == 0 diff --git a/controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml b/controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml deleted file mode 100644 index a63e51a..0000000 --- a/controller/share/dtf-controller/ansible/playbooks/include/prepare-testenv.yml +++ /dev/null @@ -1,3 +0,0 @@ -- yum: state=present name=postgresql-server - -- yum: state=present name=postgresql-upgrade -- cgit