From 4404e2148cb52c0e1c220ef70f75bf2cddbba341 Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Sat, 22 Mar 2025 12:19:13 +0530 Subject: [PATCH 1/2] fix(cassandra-debian): resolve dependencies issues to fix cassandra debian tests --- test/definitions/ohi/linux/cassandra-debian.json | 2 +- .../install/debian/roles/prepare/tasks/installCassandra.yml | 2 +- .../install/debian/roles/prepare/tasks/installDependencies.yml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/definitions/ohi/linux/cassandra-debian.json b/test/definitions/ohi/linux/cassandra-debian.json index d25d92343..d805ac409 100644 --- a/test/definitions/ohi/linux/cassandra-debian.json +++ b/test/definitions/ohi/linux/cassandra-debian.json @@ -18,7 +18,7 @@ "services": [{ "id": "cassandra1", "destinations": ["host1"], - "source_repository": "https://github.com/newrelic/open-install-library.git", + "source_repository": "-b fix/cassandra-debian https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/linux/cassandra/install/debian/roles", "port": 9042, "params":{ diff --git a/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installCassandra.yml b/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installCassandra.yml index 24b445d24..7800a191d 100644 --- a/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installCassandra.yml +++ b/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installCassandra.yml @@ -14,4 +14,4 @@ ansible.builtin.apt: name: cassandra update_cache: yes - become: true + become: true \ No newline at end of file diff --git a/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml b/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml index c1222f4fd..312250b0b 100644 --- a/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml +++ b/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml @@ -11,6 +11,7 @@ - dirmngr - gnupg - software-properties-common - - wget + - openjdk-11-jdk update_cache: true become: true + From 78ef194e10dfd4acb2f7a3166c93a75757f70dbb Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Fri, 28 Mar 2025 17:49:04 +0530 Subject: [PATCH 2/2] fix(cassandra-debian): update branch config --- test/definitions/ohi/linux/cassandra-debian.json | 2 +- .../install/debian/roles/prepare/tasks/installDependencies.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/definitions/ohi/linux/cassandra-debian.json b/test/definitions/ohi/linux/cassandra-debian.json index d805ac409..d25d92343 100644 --- a/test/definitions/ohi/linux/cassandra-debian.json +++ b/test/definitions/ohi/linux/cassandra-debian.json @@ -18,7 +18,7 @@ "services": [{ "id": "cassandra1", "destinations": ["host1"], - "source_repository": "-b fix/cassandra-debian https://github.com/newrelic/open-install-library.git", + "source_repository": "https://github.com/newrelic/open-install-library.git", "deploy_script_path": "test/deploy/linux/cassandra/install/debian/roles", "port": 9042, "params":{ diff --git a/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml b/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml index 312250b0b..9cbf457a5 100644 --- a/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml +++ b/test/deploy/linux/cassandra/install/debian/roles/prepare/tasks/installDependencies.yml @@ -14,4 +14,3 @@ - openjdk-11-jdk update_cache: true become: true -