[bigtop] branch branch-3.2 updated: BIGTOP-3942: Rename solrcloud to solr for puppet role map (#1111)

[iwasakims]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new 654637dd5 BIGTOP-3942: Rename solrcloud to solr for puppet role map 
(#1111)
654637dd5 is described below

commit 654637dd57832a33a4233aaa741e511292070fc8
Author: Zhiguo Wu <wuzhi...@apache.org>
AuthorDate: Thu Sep 7 12:52:29 2023 +0800

    BIGTOP-3942: Rename solrcloud to solr for puppet role map (#1111)
    
    (cherry picked from commit b6c0125642b4e635387844be95e8f52231bf277e)
---
 bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 2 +-
 bigtop-deploy/puppet/hieradata/site.yaml           | 2 +-
 bigtop-deploy/puppet/manifests/cluster.pp          | 2 +-
 bigtop-tests/smoke-tests/solr/build.gradle         | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml 
b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
index dd6878852..be10ca13d 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
@@ -16,7 +16,7 @@
 # "$components" list. If $components isn't set then everything in the stack 
will
 # be installed as usual. Otherwise only a specified list will be set
 # Possible elements:
-# hadoop,yarn,hbase,alluxio,flink,solrcloud,spark,oozie,hcat,httpfs,
+# hadoop,yarn,hbase,alluxio,flink,solr,spark,oozie,hcat,httpfs,
 # pig,hive,zookeeper,ycsb
 # Example (to deploy only HDFS and YARN server and gateway parts)
 # This can be a comma-separated list or an array.
diff --git a/bigtop-deploy/puppet/hieradata/site.yaml 
b/bigtop-deploy/puppet/hieradata/site.yaml
index d467ff55f..094bb8522 100644
--- a/bigtop-deploy/puppet/hieradata/site.yaml
+++ b/bigtop-deploy/puppet/hieradata/site.yaml
@@ -22,7 +22,7 @@ hadoop::hadoop_storage_dirs:
 #  - httpfs
 #  - mapred-app
 #  - oozie
-#  - solrcloud
+#  - solr
 #  - spark
 #  - spark-standalone
 #  - tez
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp 
b/bigtop-deploy/puppet/manifests/cluster.pp
index 3ef6a196e..7026a6992 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -62,7 +62,7 @@ $roles_map = {
     worker => ["hbase-server"],
     client => ["hbase-client"],
   },
-  solrcloud => {
+  solr => {
     worker => ["solr-server"],
   },
   spark => {
diff --git a/bigtop-tests/smoke-tests/solr/build.gradle 
b/bigtop-tests/smoke-tests/solr/build.gradle
index 84a24f069..89d851db9 100644
--- a/bigtop-tests/smoke-tests/solr/build.gradle
+++ b/bigtop-tests/smoke-tests/solr/build.gradle
@@ -40,7 +40,6 @@ dependencies {
   compile group: 'junit', name: 'junit', version: junitVersion, transitive: 
'true'
   compile group: 'org.apache.solr', name: 'solr-solrj', version: solrVersion, 
transitive: 'true'
   compile group: 'org.slf4j', name: 'slf4j-simple', version: slf4jVersion, 
transitive: 'true'
-  if (System.env.HADOOP_CONF_DIR) testRuntime files(System.env.HADOOP_CONF_DIR)
 }
 
 sourceSets {
@@ -54,7 +53,6 @@ sourceSets {
 }
 
 test.doFirst {
-  checkEnv(["HADOOP_CONF_DIR"])
   create_collection()
 }