From 5a825785e358897b1586aea849d20290232d899b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Busse?= <bj.rn@baerlin.eu>
Date: Mon, 8 Mar 2021 23:47:08 +0100
Subject: [PATCH] testsuite: Use more ansible for setup

---
 tests/hbase/defaults/main.yml     | 3 ++-
 tests/hbase/files/hbase-config.sh | 5 +----
 tests/hbase/tasks/main.yml        | 9 +++++----
 tests/hdfs/defaults/main.yml      | 1 +
 tests/hdfs/files/hadoop-config.sh | 5 +----
 tests/hdfs/tasks/main.yml         | 5 +++--
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/tests/hbase/defaults/main.yml b/tests/hbase/defaults/main.yml
index aac99c9..83946f7 100644
--- a/tests/hbase/defaults/main.yml
+++ b/tests/hbase/defaults/main.yml
@@ -1,3 +1,4 @@
 hbase_version: "0.96.1.1"
-hbase_archive: "hbase-{{ hbase_version }}-hadoop2-bin.tar.gz"
+hbase_archive_file: "hbase-{{ hbase_version }}-hadoop2-bin.tar.gz"
+hbase_archive_file_checksum256: "7334e7da0b655ab02cfc64454c3d2e93a4c584efbde2dfd37915b9530d1643f8"
 hbase_archive_url: "https://archive.apache.org/dist/hbase/hbase-{{ hbase_version }}/{{ hbase_archive }}"
diff --git a/tests/hbase/files/hbase-config.sh b/tests/hbase/files/hbase-config.sh
index ace804a..bf9f481 100755
--- a/tests/hbase/files/hbase-config.sh
+++ b/tests/hbase/files/hbase-config.sh
@@ -11,10 +11,8 @@ HBASE_FILE_CKSUM="1625453f839f7d8c86078a131af9731f6df28c59e58870db84913dcbc640d4
 HBASE_CONFIG_TEMPLATE="hbase/conf/hbase-site.xml.j2"
 HBASE_TEST_SUITE_EXECUTABLE="hbase/bin/hbase"
 
-declare -a DEPS=("java")
-
 SCRIPT_PATH=$(dirname "$0")
-source $SCRIPT_PATH/setup.sh
+source $SCRIPT_PATH/../../setup.sh
 
 create_hbase_config_template() {
     read -r -d '' CONFIG <<EOF
@@ -38,6 +36,5 @@ EOF
     echo "$CONFIG"
 }
 
-check_dependencies
 HBASE_CONFIG=$(create_hbase_config_template)
 write_file ${HBASE_CONFIG_TEMPLATE} "${HBASE_CONFIG}"
diff --git a/tests/hbase/tasks/main.yml b/tests/hbase/tasks/main.yml
index 834e880..c666903 100644
--- a/tests/hbase/tasks/main.yml
+++ b/tests/hbase/tasks/main.yml
@@ -5,19 +5,20 @@
       url: "{{ hbase_archive_url }}"
       dest: "{{ script_path }}"
       mode: 0600
-      checksum: sha256:7334e7da0b655ab02cfc64454c3d2e93a4c584efbde2dfd37915b9530d1643f8
+      checksum: sha256:{{ hbase_archive_file_checksum256 }}
+    run_once: true
     delegate_to: localhost
 
   - name: Copy archive
     copy:
-      src: "{{ script_path }}/{{ hbase_file }}"
+      src: "{{ script_path }}/{{ hbase_archive }}"
       dest: "/tmp"
       remote_src: yes
 
   - name: Extract archive
     ansible.builtin.unarchive:
-      src: "/tmp/{{ hbase_file }}"
-      dest: "{{ script_path }}"
+      src: "/tmp/{{ hbase_archive }}"
+      dest: "/tmp"
       remote_src: yes
 
   - name: Write config template
diff --git a/tests/hdfs/defaults/main.yml b/tests/hdfs/defaults/main.yml
index a122f6c..d6e1405 100644
--- a/tests/hdfs/defaults/main.yml
+++ b/tests/hdfs/defaults/main.yml
@@ -1,3 +1,4 @@
 hadoop_version: "2.10.0"
 hadoop_archive_file: "hadoop-{{ hadoop_version }}.tar.gz"
+hadoop_archive_file_checksum256: "273d5fa1d479d0bb96759b16cf4cbd6ba3e7f863a0778cbae55ab83417e961f0"
 hadoop_archive_url: "https://artfiles.org/apache.org/hadoop/common/hadoop-{{ hadoop_version }}}/{{ hadoop_archive_file }}"
diff --git a/tests/hdfs/files/hadoop-config.sh b/tests/hdfs/files/hadoop-config.sh
index 0c2548f..1ed87af 100755
--- a/tests/hdfs/files/hadoop-config.sh
+++ b/tests/hdfs/files/hadoop-config.sh
@@ -13,9 +13,7 @@ HDFS_CONFIG_DATANODES="localhost"
 HDFS_TEST_SUITE_EXECUTABLE="hadoop/bin/hdfs"
 
 SCRIPT_PATH=$(dirname "$0")
-source $SCRIPT_PATH/setup.sh
-
-declare -a DEPS=("java" "ansible-playbook")
+source $SCRIPT_PATH/../../setup.sh
 
 create_hdfs_core_config_template() {
     #printf "Writing HDFS core-site.xml config\n"
@@ -114,7 +112,6 @@ EOF
     echo "$CONFIG"
 }
 
-check_dependencies
 HDFS_CONFIG=$(create_hdfs_config_template)
 HDFS_CONFIG_CORE=$(create_hdfs_core_config_template)
 HDFS_CONFIG_MAPRED=$(create_hdfs_mapred_config_template)
diff --git a/tests/hdfs/tasks/main.yml b/tests/hdfs/tasks/main.yml
index 7780763..b475cc5 100644
--- a/tests/hdfs/tasks/main.yml
+++ b/tests/hdfs/tasks/main.yml
@@ -5,7 +5,8 @@
       url: "{{ hadoop_archive_url }}"
       dest: "{{ script_path }}"
       mode: 0600
-      checksum: sha256:273d5fa1d479d0bb96759b16cf4cbd6ba3e7f863a0778cbae55ab83417e961f0
+      checksum: sha256:{{ hadoop_archive_file_checksum256 }}
+    run_once: true
     delegate_to: localhost
 
   - name: Copy archive
@@ -17,7 +18,7 @@
   - name: Extract archive
     ansible.builtin.unarchive:
       src: "/tmp/{{ hadoop_archive }}"
-      dest: "{{ script_path }}"
+      dest: "/tmp"
       remote_src: yes
 
   - name: Write config template