From 936c50145bb7475d097540e90d513ba7fab0637e Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 25 Sep 2019 16:37:11 -0400 Subject: [PATCH] ansible: Add el8 packages Signed-off-by: Michael Jeanson --- automation/ansible/hosts | 17 +++++++++++ automation/ansible/node-el8.yml | 8 +++++ .../roles/babeltrace/tasks/setup-RedHat.yml | 2 +- .../ansible/roles/babeltrace/vars/RedHat.yml | 9 +++++- .../roles/common/tasks/setup-RedHat.yml | 2 +- .../ansible/roles/common/vars/RedHat.yml | 30 +++++++++++++++++-- .../roles/liburcu/tasks/setup-RedHat.yml | 2 +- .../ansible/roles/liburcu/vars/RedHat.yml | 3 +- .../lttng-modules/tasks/setup-RedHat.yml | 2 +- .../roles/lttng-modules/vars/RedHat.yml | 8 ++++- .../roles/lttng-tools/tasks/setup-RedHat.yml | 2 +- .../ansible/roles/lttng-tools/vars/RedHat.yml | 8 +++-- .../roles/lttng-ust/tasks/setup-RedHat.yml | 2 +- .../ansible/roles/lttng-ust/vars/RedHat.yml | 5 +++- automation/ansible/site.yml | 1 + 15 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 automation/ansible/node-el8.yml diff --git a/automation/ansible/hosts b/automation/ansible/hosts index 6721070..75cb224 100644 --- a/automation/ansible/hosts +++ b/automation/ansible/hosts @@ -13,9 +13,19 @@ cloud05.internal.efficios.com [node-armhf] ci-node-bionic-armhf-01 ci-node-bionic-armhf-02 +lava-armhf-wandboard-01 +lava-armhf-wandboard-02 +ci-node-bionic-armhf-05 +ci-node-bionic-armhf-06 +ci-node-bionic-armhf-07 +ci-node-bionic-armhf-08 [node-arm64] +ci-node-bionic-arm64-01 ci-node-bionic-arm64-02 +ci-node-bionic-arm64-03 +ci-node-bionic-arm64-04 +ci-node-bionic-arm64-05 [node-powerpc] ci-node-xenial-powerpc-01 @@ -86,6 +96,12 @@ ci-rootnode-bionic-amd64-03 [node-sles] ci-node-sles12sp2-amd64-03-01 +[node-el8] +ci-node-el8-amd64-03-01 + +[node-el8:vars] +ansible_python_interpreter=/usr/bin/python3 + [node:children] node-i386 node-amd64 @@ -95,3 +111,4 @@ node-powerpc node-ppc64el node-standalone node-sles +node-el8 diff --git a/automation/ansible/node-el8.yml b/automation/ansible/node-el8.yml new file mode 100644 index 0000000..a4b7333 --- /dev/null +++ b/automation/ansible/node-el8.yml @@ -0,0 +1,8 @@ +- hosts: node-el8 + roles: + - common + - babeltrace + - liburcu + - lttng-ust + - lttng-tools + - lttng-modules diff --git a/automation/ansible/roles/babeltrace/tasks/setup-RedHat.yml b/automation/ansible/roles/babeltrace/tasks/setup-RedHat.yml index 46d9f5b..5bbf974 100644 --- a/automation/ansible/roles/babeltrace/tasks/setup-RedHat.yml +++ b/automation/ansible/roles/babeltrace/tasks/setup-RedHat.yml @@ -1,6 +1,6 @@ --- - name: Ensure babeltrace build dependencies are installed. - yum: + dnf: name: "{{ item }}" state: installed with_items: "{{ babeltrace_packages }}" diff --git a/automation/ansible/roles/babeltrace/vars/RedHat.yml b/automation/ansible/roles/babeltrace/vars/RedHat.yml index 67429a2..bf15e2f 100644 --- a/automation/ansible/roles/babeltrace/vars/RedHat.yml +++ b/automation/ansible/roles/babeltrace/vars/RedHat.yml @@ -1,3 +1,10 @@ --- -# TODO __babeltrace_packages: + - popt-devel + - libuuid-devel + - python36-devel +# - python3-sphinx + - swig + - glib2-devel + - elfutils-devel + - chrpath diff --git a/automation/ansible/roles/common/tasks/setup-RedHat.yml b/automation/ansible/roles/common/tasks/setup-RedHat.yml index ab7ad87..e21caf6 100644 --- a/automation/ansible/roles/common/tasks/setup-RedHat.yml +++ b/automation/ansible/roles/common/tasks/setup-RedHat.yml @@ -1,6 +1,6 @@ --- - name: Ensure common packages are installed. - yum: + dnf: name: "{{ item }}" state: installed with_items: "{{ common_packages }}" diff --git a/automation/ansible/roles/common/vars/RedHat.yml b/automation/ansible/roles/common/vars/RedHat.yml index 35f8482..48043fa 100644 --- a/automation/ansible/roles/common/vars/RedHat.yml +++ b/automation/ansible/roles/common/vars/RedHat.yml @@ -1,4 +1,30 @@ --- -# TODO __common_packages: - - java-1.7.0-openjdk-headless + - openssh-server + - sudo + - java-1.8.0-openjdk-devel + - git + - vim + - emacs-nox + - tree + - htop +# - build-essential + - clang +# - clang-tools + - automake + - autoconf + - libtool + - bison + - flex + - perl-Test-Harness + - jq +# - cppcheck +# - cloc + - python3-virtualenv + - curl + - gettext + - openssl-devel + - psmisc + - rsync +# - pbzip2 + - lzop diff --git a/automation/ansible/roles/liburcu/tasks/setup-RedHat.yml b/automation/ansible/roles/liburcu/tasks/setup-RedHat.yml index 790949c..2975974 100644 --- a/automation/ansible/roles/liburcu/tasks/setup-RedHat.yml +++ b/automation/ansible/roles/liburcu/tasks/setup-RedHat.yml @@ -1,6 +1,6 @@ --- - name: Ensure liburcu build dependencies are installed. - yum: + dnf: name: "{{ item }}" state: installed with_items: "{{ liburcu_packages }}" diff --git a/automation/ansible/roles/liburcu/vars/RedHat.yml b/automation/ansible/roles/liburcu/vars/RedHat.yml index e6a75e7..c597f60 100644 --- a/automation/ansible/roles/liburcu/vars/RedHat.yml +++ b/automation/ansible/roles/liburcu/vars/RedHat.yml @@ -1,3 +1,2 @@ --- -# TODO -__liburcu_packages: +__liburcu_packages: [] diff --git a/automation/ansible/roles/lttng-modules/tasks/setup-RedHat.yml b/automation/ansible/roles/lttng-modules/tasks/setup-RedHat.yml index 3f2333e..5dbdba4 100644 --- a/automation/ansible/roles/lttng-modules/tasks/setup-RedHat.yml +++ b/automation/ansible/roles/lttng-modules/tasks/setup-RedHat.yml @@ -1,6 +1,6 @@ --- - name: Ensure lttng-modules build dependencies are installed. - yum: + dnf: name: "{{ item }}" state: installed with_items: "{{ lttng_modules_packages }}" diff --git a/automation/ansible/roles/lttng-modules/vars/RedHat.yml b/automation/ansible/roles/lttng-modules/vars/RedHat.yml index 2b88bab..a5ce339 100644 --- a/automation/ansible/roles/lttng-modules/vars/RedHat.yml +++ b/automation/ansible/roles/lttng-modules/vars/RedHat.yml @@ -1,2 +1,8 @@ --- -__lttng_modules_packages: [] +__lttng_modules_packages: +# - kernel-wedge + - elfutils-devel + - bc +# - s3cmd +# - u-boot-tools +# - module-init-tools diff --git a/automation/ansible/roles/lttng-tools/tasks/setup-RedHat.yml b/automation/ansible/roles/lttng-tools/tasks/setup-RedHat.yml index 8d9a7fd..3fad2e6 100644 --- a/automation/ansible/roles/lttng-tools/tasks/setup-RedHat.yml +++ b/automation/ansible/roles/lttng-tools/tasks/setup-RedHat.yml @@ -1,6 +1,6 @@ --- - name: Ensure lttng-tools build dependencies are installed. - yum: + dnf: name: "{{ item }}" state: installed with_items: "{{ lttng_tools_packages }}" diff --git a/automation/ansible/roles/lttng-tools/vars/RedHat.yml b/automation/ansible/roles/lttng-tools/vars/RedHat.yml index bc31117..c22ac55 100644 --- a/automation/ansible/roles/lttng-tools/vars/RedHat.yml +++ b/automation/ansible/roles/lttng-tools/vars/RedHat.yml @@ -1,5 +1,7 @@ --- -# TODO __lttng_tools_packages: - -__lttng_tools_packages_no_recommends: + - popt-devel + - libxml2-devel + - bash-completion + - asciidoc + - xmlto diff --git a/automation/ansible/roles/lttng-ust/tasks/setup-RedHat.yml b/automation/ansible/roles/lttng-ust/tasks/setup-RedHat.yml index ee4f778..3bcae48 100644 --- a/automation/ansible/roles/lttng-ust/tasks/setup-RedHat.yml +++ b/automation/ansible/roles/lttng-ust/tasks/setup-RedHat.yml @@ -1,6 +1,6 @@ --- - name: Ensure lttng-ust build dependencies are installed. - yum: + dnf: name: "{{ item }}" state: installed with_items: "{{ lttng_ust_packages }}" diff --git a/automation/ansible/roles/lttng-ust/vars/RedHat.yml b/automation/ansible/roles/lttng-ust/vars/RedHat.yml index 1e8ed60..b85543d 100644 --- a/automation/ansible/roles/lttng-ust/vars/RedHat.yml +++ b/automation/ansible/roles/lttng-ust/vars/RedHat.yml @@ -1,3 +1,6 @@ --- -# TODO __lttng_ust_packages: + - libuuid-devel +# - texinfo +# - liblog4j1.2-java + - numactl-devel diff --git a/automation/ansible/site.yml b/automation/ansible/site.yml index b9a2be4..17df035 100644 --- a/automation/ansible/site.yml +++ b/automation/ansible/site.yml @@ -8,3 +8,4 @@ - import_playbook: node-amd64.yml - import_playbook: node-standalone.yml - import_playbook: node-sles.yml +- import_playbook: node-el8.yml -- 2.34.1