Merge branch 'zRains:feat-chromium-browser' into feat-chromium-browser

akioee · Aug 13, 2024 · fd551a2 · fd551a2
2 parents dfb60d6 + e1277b4
commit fd551a2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
@@ -135,7 +135,7 @@
               <commandlineArgs>${args.shell} ${basedir}${dirsep}set-ambari-version.${fileextension.shell} ${ambariVersion}</commandlineArgs>
             </configuration>
           </execution>
-          <!-- <execution>
+          <execution>
             <id>unit test</id>
             <phase>test</phase>
             <goals>
@@ -149,7 +149,7 @@
                 <argument>test-single-run</argument>
               </arguments>
             </configuration>
-          </execution> -->
+          </execution>
         </executions>
       </plugin>
       <plugin>

diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -21,11 +21,9 @@
     "http-server": "0.6.1",
     "jasmine-core": "^3.1.0",
     "karma": "^2.0.4",
-    "karma-chrome-launcher": "0.1.4",
     "karma-jasmine": "^1.1.2",
     "karma-ng-html2js-preprocessor": "^1.0.0",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "phantomjs": "^2.1.7",
+    "karma-chrome-launcher": "3.2.0",
     "protractor": "1.0.0"
   },
   "scripts": {

diff --git a/ambari-admin/src/main/resources/ui/admin-web/test/karma.conf.js b/ambari-admin/src/main/resources/ui/admin-web/test/karma.conf.js
@@ -42,13 +42,28 @@ module.exports = function(config){
 
     autoWatch : true,
 
+    colors: true,
+
+    logLevel: config.LOG_INFO,
+
+    captureTimeout: 60000,
+
+    browserNoActivityTimeout: 30000,
+
     frameworks: ['jasmine'],
 
-    browsers: ['PhantomJS'],
+    customLaunchers: {
+      ChromeHeadlessCustom: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox', '--disable-gpu', '--disable-translate', '--disable-extensions']
+      }
+    },
+
+    browsers: ['ChromeHeadlessCustom'],
 
     plugins : [
             'karma-jasmine',
-            'karma-phantomjs-launcher',
+            'karma-chrome-launcher',
             'karma-ng-html2js-preprocessor'
             ],
 

diff --git a/ambari-server/src/main/python/bootstrap.py b/ambari-server/src/main/python/bootstrap.py
@@ -345,7 +345,7 @@ def getRunSetupCommand(self, expected_hostname):
     user_run_as = self.shared_state.user_run_as
     server = self.shared_state.ambari_server
     version = self.getAmbariVersion()
-    return ' '.join(['python', setupFile, expected_hostname, passphrase, server, user_run_as, version])
+    return ' '.join(['python3', setupFile, expected_hostname, passphrase, server, user_run_as, version])
 
   def runSetupAgent(self):
     self.host_log.write("==========================\n")
@@ -609,7 +609,7 @@ def getRunSetupWithPasswordCommand(self, expected_hostname):
     version = self.getAmbariVersion()
     port = self.getAmbariPort()
     passwordFile = self.getPasswordFile()
-    return "{sudo} -S python ".format(sudo=AMBARI_SUDO) + str(setupFile) + " " + str(expected_hostname) + \
+    return "{sudo} -S python3 ".format(sudo=AMBARI_SUDO) + str(setupFile) + " " + str(expected_hostname) + \
            " " + str(passphrase) + " " + str(server)+ " " + quote_bash_args(str(user_run_as)) + " " + str(version) + \
            " " + str(port) + " < " + str(passwordFile)
 
@@ -620,7 +620,7 @@ def getRunSetupWithoutPasswordCommand(self, expected_hostname):
     user_run_as = self.shared_state.user_run_as
     version=self.getAmbariVersion()
     port=self.getAmbariPort()
-    return "{sudo} python ".format(sudo=AMBARI_SUDO) + str(setupFile) + " " + str(expected_hostname) + \
+    return "{sudo} python3 ".format(sudo=AMBARI_SUDO) + str(setupFile) + " " + str(expected_hostname) + \
            " " + str(passphrase) + " " + str(server)+ " " + quote_bash_args(str(user_run_as)) + " " + str(version) + \
            " " + str(port)