This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new b8448e443 BIGTOP-4126. Remove obsolete test resources for Hue. (#1280)
b8448e443 is described below
commit b8448e4436263c051c0b0eaba4f4c9395d93a271
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Tue Jun 18 14:57:19 2024 +0900
BIGTOP-4126. Remove obsolete test resources for Hue. (#1280)
(cherry picked from commit c1b281e2d093937780cce32147e38de5bcf145d2)
Conflicts:
bigtop-tests/test-artifacts/hue/pom.xml
bigtop-tests/test-execution/smokes/hue/pom.xml
---
bigtop-tests/test-artifacts/fatjar/pom.xml | 6 --
bigtop-tests/test-artifacts/hue/pom.xml | 33 ---------
.../bigtop/itest/huesmoke/TestHueSmoke.groovy | 65 -----------------
.../bigtop/itest/packagesmoke/BTServices.groovy | 7 +-
.../itest/packagesmoke/StateVerifierHue.groovy | 57 ---------------
.../src/main/resources/apt/package_data.xml | 12 ----
.../package/src/main/resources/package_data.xml | 81 ----------------------
.../src/main/resources/yum/package_data.xml | 11 ---
.../src/main/resources/zypper/package_data.xml | 11 ---
bigtop-tests/test-artifacts/pom.xml | 1 -
bigtop-tests/test-execution/smokes/hue/pom.xml | 70 -------------------
bigtop-tests/test-execution/smokes/pom.xml | 8 ---
12 files changed, 1 insertion(+), 361 deletions(-)
diff --git a/bigtop-tests/test-artifacts/fatjar/pom.xml
b/bigtop-tests/test-artifacts/fatjar/pom.xml
index 624ba63af..715e2cc0e 100644
--- a/bigtop-tests/test-artifacts/fatjar/pom.xml
+++ b/bigtop-tests/test-artifacts/fatjar/pom.xml
@@ -43,12 +43,6 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>hue-smoke</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.apache.bigtop.itest</groupId>
<artifactId>solr-smoke</artifactId>
diff --git a/bigtop-tests/test-artifacts/hue/pom.xml
b/bigtop-tests/test-artifacts/hue/pom.xml
deleted file mode 100644
index 125086640..000000000
--- a/bigtop-tests/test-artifacts/hue/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>bigtop-smokes</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>hue-smoke</artifactId>
- <version>3.4.0-SNAPSHOT</version>
-
- <name>huesmoke</name>
-
-</project>
diff --git
a/bigtop-tests/test-artifacts/hue/src/main/groovy/org/apache/bigtop/itest/huesmoke/TestHueSmoke.groovy
b/bigtop-tests/test-artifacts/hue/src/main/groovy/org/apache/bigtop/itest/huesmoke/TestHueSmoke.groovy
deleted file mode 100644
index da9284866..000000000
---
a/bigtop-tests/test-artifacts/hue/src/main/groovy/org/apache/bigtop/itest/huesmoke/TestHueSmoke.groovy
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.bigtop.itest.hue.smoke
-
-import static org.junit.Assert.assertEquals
-import static org.junit.Assert.assertTrue
-
-import org.apache.bigtop.itest.JarContent
-import org.apache.bigtop.itest.shell.Shell
-import org.junit.Test
-
-public class TestHueSmoke {
- final static String hueServer =
System.getProperty("org.apache.bigtop.itest.hue_url", "http://localhost:8888";);
- final static String loginURL = "${hueServer}/accounts/login/";
- final static String checkURL = "${hueServer}/debug/check_config";
- final static String creds = "username=admin&password=admin";
- final static Map checkApps = ["about": "<title>About Hue</title>",
- "filebrowser/view": "<title>File Browser</title>",
- "help": "<title>Hue Help</title>",
- // FIXME: HUE-10 "jobbrowser" : "<title>Error</title>",
- "jobsub": "<title>Job Designer</title>",
- "useradmin": "<title>Hue Users</title>",
- "beeswax": "<title>Hive Query</title>",
-
- Shell sh = new Shell();
-
- @Test
- void testHueCheckConfig() {
- String sessionId;
- List<String> failedApps = [];
-
- // first call creates admin/admin username/keypair
- sh.exec("curl -m 60 --data '${creds}' ${loginURL}");
-
- sh.exec("curl -m 60 -i --data '${creds}' ${loginURL} | sed -e
's#Set-Cookie: *##' -e 's#;.*\$##' | grep '^sessionid'");
- sessionId = sh.getOut().join('');
-
- sh.exec("curl -m 60 -b '${sessionId}' ${checkURL}");
- assertTrue("Global configuration check failed",
- sh.getOut().grep(~/.*All ok. Configuration check passed.*/).size() > 0);
- checkApps.each { app, expected ->
- sh.exec("curl -m 60 -b '${sessionId}' ${hueServer}/${app}/");
- if (sh.getOut().join(' ').indexOf(expected) == -1) {
- failedApps.add(app);
- }
- }
- assertEquals("Application(s) ${failedApps} failed to respond",
- 0, failedApps.size());
- }
-}
diff --git
a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy
b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy
index d9ea9be45..106227fe1 100644
---
a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy
+++
b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/BTServices.groovy
@@ -21,7 +21,7 @@ package org.apache.bigtop.itest.packagesmoke
import org.apache.bigtop.itest.pmanager.PackageManager
class BTServices {
- static final List serviceDaemonUserNames = ["hbase", "hdfs", "hue", "mapred",
+ static final List serviceDaemonUserNames = ["hbase", "hdfs", "mapred",
"zookeeper", "hadoop"];
static final Map components = [
@@ -49,11 +49,6 @@ class BTServices {
verifier: new StateVerifierZookeeper(),
killIDs: ["zookeeper"],
],
- hue: [services: ["hadoop-namenode", "hadoop-datanode",
"hadoop-jobtracker", "hadoop-tasktracker",
- "hue"],
- killIDs: ["hdfs", "mapred", "hue"],
- verifier: new StateVerifierHue(),
- ],
];
static final Map<String, List<String>> release2services = [
diff --git
a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierHue.groovy
b/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierHue.groovy
deleted file mode 100644
index 9339f0e10..000000000
---
a/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierHue.groovy
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.bigtop.itest.packagesmoke
-
-import org.apache.bigtop.itest.shell.Shell
-import org.junit.Test
-
-class StateVerifierHue extends StateVerifier {
- final static String hueServer = "http://localhost:8088";
- final static String loginURL = "${hueServer}/accounts/login/";
- final static String checkURL = "${hueServer}/debug/check_config";
- final static String creds = "username=admin&password=admin";
- final static List<String> checkApps = ["about", "beeswax", "filebrowser",
"help", "jobbrowser", "jobsub", "useradmin"];
-
- Shell sh = new Shell();
-
- public boolean config() {
- Shell shRoot = new Shell("/bin/bash", "root");
- return 0 == shRoot.exec("sed -ie 's#^secret_key=#secret_key=1234567890#'
/etc/hue/hue.ini").getRet();
- }
-
- public void createState() {
- // first call creates admin/admin username/keypair
- sh.exec("curl -m 60 --data '${creds}' ${loginURL}");
- }
-
- public boolean verifyState() {
- String sessionId;
- boolean res;
-
- sh.exec("curl -m 60 -i --data '${creds}' ${loginURL} | sed -e
's#Set-Cookie: *##' -e 's#;.*\$##' | grep '^sessionid'");
- sessionId = sh.getOut().join('');
-
- sh.exec("curl -m 60 -b '${sessionId}' ${checkURL}");
- res = (sh.getOut().grep(~/.*All ok. Configuration check passed.*/).size()
!= 0)
- checkApps.each {
- sh.exec("curl -m 60 -b '${sessionId}' ${hueServer}/${it}/");
- res = res && (sh.getOut().grep(~/.*Page Not Found.*/).size() == 0);
- }
- return res;
- }
-}
diff --git
a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
index 768a7fa6d..3bc3eb009 100644
---
a/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
+++
b/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
@@ -465,16 +465,4 @@
<libhdfs0>/self</libhdfs0>
</deps>
</libhdfs0-dev>
- <hue-server>
- <services>
- <hue>
- <runlevel>2</runlevel>
- <runlevel>3</runlevel>
- <runlevel>4</runlevel>
- <runlevel>5</runlevel>
- <oninstall>start</oninstall>
- <configured>true</configured>
- </hue>
- </services>
- </hue-server>
</packages>
diff --git
a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
index a242fc1bb..411006a95 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
@@ -696,85 +696,4 @@ but all on the same machine.</description>
<hadoop-libhdfs>/self</hadoop-libhdfs>
</deps>
</hadoop-hdfs-fuse>
- <hue-common>
- <metadata>
- <summary>A browser-based desktop interface for Hadoop</summary>
- <description>Hue is a browser-based desktop interface for interacting
with Hadoop.
-It supports a file browser, job tracker interface, cluster health monitor, and
more.</description>
- <url>http://github.com/cloudera/hue</url>
- </metadata>
- <deps>
- <hue-server>/self</hue-server>
- <hue-beeswax>/self</hue-beeswax>
- </deps>
- <alternatives>
- <hue-conf>
- <status>auto</status>
- <link>/etc/hue/conf</link>
- <value>/etc/hue/conf.empty</value>
- <alt>/etc/hue/conf.empty</alt>
- </hue-conf>
- </alternatives>
- </hue-common>
- <hue-server>
- <metadata>
- <summary>Service Scripts for Hue</summary>
- <description>This package provides the service scripts for Hue
server.</description>
- <url>http://github.com/cloudera/hue</url>
- </metadata>
- <deps>
- <hue-common>/self</hue-common>
- </deps>
- </hue-server>
- <hue-doc>
- <metadata>
- <summary>Documentation for Hue</summary>
- <description>This package provides the installation manual, user guide,
SDK documentation, and release notes.</description>
- <url>http://github.com/cloudera/hue</url>
- </metadata>
- <deps>
- </deps>
- <alternatives>
- </alternatives>
- </hue-doc>
- <hue-beeswax>
- <metadata>
- <summary>A UI for Hive on Hue</summary>
- <description>Beeswax is a web interface for Hive.
-
-It allows users to construct and run queries on Hive, manage tables,
-and import and export data.</description>
- <url>http://github.com/cloudera/hue</url>
- </metadata>
- <deps>
- <hue-common>/self</hue-common>
- <hive/>
- <make/>
- </deps>
- </hue-beeswax>
- <hue-pig>
- <metadata>
- <summary>A UI for Pig on Hue</summary>
- <description>A web interface for Pig.
-
-It allows users to construct and run Pig jobs.</description>
- <url>http://github.com/cloudera/hue</url>
- </metadata>
- <deps>
- <hue-common>/self</hue-common>
- <make/>
- <pig/>
- </deps>
- </hue-pig>
- <hue>
- <metadata>
- <summary>The hue metapackage</summary>
- <description>Hue is a browser-based desktop interface for interacting
with Hadoop. It supports a file browser, job tracker interface, cluster health
monitor, and more.</description>
- <url>http://github.com/cloudera/hue</url>
- </metadata>
- <deps>
- <hue-server>/self</hue-server>
- <hue-beeswax>/self</hue-beeswax>
- </deps>
- </hue>
</packages>
diff --git
a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
index 344117d46..964ee19dc 100644
---
a/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
+++
b/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
@@ -472,15 +472,4 @@ package or when debugging this package.</description>
<url>http://hadoop.apache.org/core/</url>
</metadata>
</hadoop-debuginfo>
- <hue-server>
- <services>
- <hue>
- <runlevel>3</runlevel>
- <runlevel>4</runlevel>
- <runlevel>5</runlevel>
- <oninstall>stop</oninstall>
- <configured>true</configured>
- </hue>
- </services>
- </hue-server>
</packages>
diff --git
a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
index 0c53e3322..8d09e19bf 100644
---
a/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
+++
b/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
@@ -453,15 +453,4 @@
<jre>>=1.6</jre>
</deps>
</hadoop-libhdfs>
- <hue-server>
- <services>
- <hue>
- <runlevel>3</runlevel>
- <runlevel>4</runlevel>
- <runlevel>5</runlevel>
- <oninstall>stop</oninstall>
- <configured>true</configured>
- </hue>
- </services>
- </hue-server>
</packages>
diff --git a/bigtop-tests/test-artifacts/pom.xml
b/bigtop-tests/test-artifacts/pom.xml
index dfe64932c..ec5ee1c1a 100644
--- a/bigtop-tests/test-artifacts/pom.xml
+++ b/bigtop-tests/test-artifacts/pom.xml
@@ -37,7 +37,6 @@
<module>package</module>
<module>httpfs</module>
<module>hbase</module>
- <module>hue</module>
<module>solr</module>
<module>longevity</module>
<module>hcatalog</module>
diff --git a/bigtop-tests/test-execution/smokes/hue/pom.xml
b/bigtop-tests/test-execution/smokes/hue/pom.xml
deleted file mode 100644
index 4d5e9da1e..000000000
--- a/bigtop-tests/test-execution/smokes/hue/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <parent>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>smoke-tests</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>hue-smoke-execution</artifactId>
- <version>3.4.0-SNAPSHOT</version>
- <name>Hue smoke test execution</name>
-
- <properties>
- <HUE_URL>${env.HUE_URL}</HUE_URL>
-
-
<org.apache.maven-dependency-plugin.groupId>org.apache.bigtop.itest</org.apache.maven-dependency-plugin.groupId>
-
<org.apache.maven-dependency-plugin.artifactId>hue-smoke</org.apache.maven-dependency-plugin.artifactId>
-
<org.apache.maven-dependency-plugin.version>${hue-smoke.version}</org.apache.maven-dependency-plugin.version>
-
<org.apache.maven-dependency-plugin.type>jar</org.apache.maven-dependency-plugin.type>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>hue-smoke</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin.version}</version>
- <configuration>
- <systemPropertyVariables>
-
<org.apache.bigtop.itest.hue_url>${HUE_URL}</org.apache.bigtop.itest.hue_url>
- </systemPropertyVariables>
- <forkMode>always</forkMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/bigtop-tests/test-execution/smokes/pom.xml
b/bigtop-tests/test-execution/smokes/pom.xml
index 91c146ca2..eaa5215d7 100644
--- a/bigtop-tests/test-execution/smokes/pom.xml
+++ b/bigtop-tests/test-execution/smokes/pom.xml
@@ -40,7 +40,6 @@
<httpfs-smoke.version>${project.version}</httpfs-smoke.version>
<hbase-smoke.version>${project.version}</hbase-smoke.version>
<hive-smoke.version>${project.version}</hive-smoke.version>
- <hue-smoke.version>${project.version}</hue-smoke.version>
<package-smoke.version>${project.version}</package-smoke.version>
<solr-smoke.version>${project.version}</solr-smoke.version>
<hcatalog-smoke.version>${project.version}</hcatalog-smoke.version>
@@ -54,7 +53,6 @@
<module>hive</module>
<module>hadoop</module>
<module>hbase</module>
- <module>hue</module>
<!--
<module>httpfs</module>
-->
@@ -89,12 +87,6 @@
<version>${hive-smoke.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.bigtop.itest</groupId>
- <artifactId>hue-smoke</artifactId>
- <version>${hue-smoke.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.bigtop.itest</groupId>
<artifactId>package-smoke</artifactId>
