diff --git a/Jenkinsfile b/Jenkinsfile index 1b88fb91..61d257d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,12 +67,8 @@ def runE2ETests() { npm --version npm ci node etc/test-setup-qa.js - # Adding sleep for the setups to complete before running test-complete - sleep 10 node etc/test-setup-dmsdk-qa.js - sleep 10 node config-optic/setupqa.js - sleep 30 cd test-complete-app ./gradlew -i mlDeploy -g $PWD cd .. diff --git a/etc/test-setup-prompt.js b/etc/test-setup-prompt.js index 9deb89de..40f1b8c3 100644 --- a/etc/test-setup-prompt.js +++ b/etc/test-setup-prompt.js @@ -1,108 +1,13 @@ /* * Copyright (c) 2015-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ -var read = require("read"); -var mlutil = require('../lib/mlutil.js'); - -function adminUserPrompt() { - var self = this; - if (self.user === null) { - read({ - prompt: 'admin user (default=admin): ' - }, - mlutil.callbackOn(self, adminUserCallback) - ); - } else { - self.passwordPrompt(); - } -} -function adminUserCallback(error, result) { - if (error) { - console.log(error); - process.exit(1); - } - this.user = (result === '') ? 'admin' : result; - this.passwordPrompt(); -} -function adminPasswordPrompt() { - var self = this; - if (self.password === null) { - read({ - prompt: (self.user === 'admin') ? - 'admin password (default=admin): ' : 'admin password: ', - silent: true, - replace: '*', - edit: false - }, - mlutil.callbackOn(self, adminPasswordCallback) - ); - } else { - self.finish(); - } -} -function adminPasswordCallback(error, result) { - if (error) { - console.log(error); - process.exit(1); - } - if (result === '') { - if (this.user === 'admin') { - this.password = 'admin'; - } else { - console.log('no admin password specified, so cannot setup'); - process.exit(1); - } - } else { - this.password = result; - } - this.finish(); -} -function adminFinish() { - this.done(this.user, this.password); -} - -function AdminPrompter(done) { - this.done = done; - this.user = null; - this.password = null; -} -AdminPrompter.prototype.userPrompt = adminUserPrompt; -AdminPrompter.prototype.userCallback = adminUserCallback; -AdminPrompter.prototype.passwordPrompt = adminPasswordPrompt; -AdminPrompter.prototype.passwordCallback = adminPasswordCallback; -AdminPrompter.prototype.finish = adminFinish; +// Simplified version - no more prompting, just returns admin/admin +// TODO: Remove this file when ml-gradle migration is complete function promptForAdmin(done) { - var prompter = new AdminPrompter(done); - - var argvLen = process.argv.length; - if (argvLen >= 4) { - var argvMax = argvLen - 1; - for (var argvI=2; argvI < argvMax; argvI++) { - var argvVal = process.argv[argvI]; - if (argvVal === '-u') { - argvVal = process.argv[argvI + 1]; - var argvSep = argvVal.indexOf(':'); - if (argvSep < 0) { - prompter.user = argvVal; - break; - } - if (argvSep > 0) { - prompter.user = argvVal.substring(0, argvSep); - } - if (argvSep < (argvVal.length - 1)) { - prompter.password = argvVal.substring(argvSep + 1); - } - break; - } else if (argvVal === '-h') { - console.log('usage: '+process.argv[1]+' [-u adminUser:adminPassword]'); - console.log('without -u, prompts for admin user and/or admin password'); - process.exit(); - } - }; - } - - prompter.userPrompt(); + // Always use admin/admin - no prompting needed + console.log('Using default admin credentials (admin/admin)'); + done('admin', 'admin'); } module.exports = promptForAdmin; diff --git a/package-lock.json b/package-lock.json index 3de77f41..9b2c7b32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,6 @@ "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", - "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", "stream-to-array": "^2.3.0" @@ -3857,13 +3856,6 @@ "node": ">= 10.13.0" } }, - "node_modules/mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true, - "license": "ISC" - }, "node_modules/mv": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", @@ -4433,19 +4425,6 @@ "node": ">=0.10.0" } }, - "node_modules/read": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", - "integrity": "sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "mute-stream": "~0.0.4" - }, - "engines": { - "node": ">=0.8" - } - }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", diff --git a/package.json b/package.json index 25ec8534..5e9227e8 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "mocha": "^11.7.3", "mocha-junit-reporter": "2.2.0", "moment": "^2.29.4", - "read": "^1.0.7", "sanitize-html": "^2.13.0", "should": "^13.2.3", "stream-to-array": "^2.3.0"