Merge pull request #1904 from zowe/users/stevenh/cherry-pick-node

Users/stevenh/cherry pick node
zowe · Jan 19, 2021 · bd71ce8 · bd71ce8
2 parents 7df8926 + cbe5e71
commit bd71ce8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/tests/installation/Jenkinsfile b/tests/installation/Jenkinsfile
@@ -161,7 +161,7 @@ node('zowe-jenkins-agent-dind-wdc') {
     // >>>>>>>> parametters for test cases
     choice(
       name: 'NODE_VERSION',
-      choices: ['v8.16.0', 'v8.17.0', 'v12.13.0', 'v12.16.1', 'v14.15.1'],
+      choices: ['v8.16.0', 'v8.17.0', 'v12.13.0', 'v12.16.1', 'v12.18.4', 'v14.15.1'],
       description: 'This option is only valid for Marist server and specify node.js version on z/OS side. The installation will set NODE_HOME to /ZOWE/node/node-{{version}}-os390-s390x.',
       trim: true
     ),

diff --git a/tests/installation/src/__tests__/extended/node-versions/node-v12.ts b/tests/installation/src/__tests__/extended/node-versions/node-v12.ts
@@ -32,7 +32,7 @@ describe(testSuiteName, () => {
       testServer,
       {
         'zowe_build_local': process.env['ZOWE_BUILD_LOCAL'],
-        'zos_node_home': '/ZOWE/node/node-v12.16.1-os390-s390x',
+        'zos_node_home': '/ZOWE/node/node-v12.18.4-os390-s390x',
         'zowe_lock_keystore': 'false',
       }
     );

diff --git a/tests/sanity/test/utils-scripts/test-component-utils.js b/tests/sanity/test/utils-scripts/test-component-utils.js
@@ -92,7 +92,7 @@ describe('verify utils/component-utils', function() {
     it('test reading component name', async function() {
       const component = 'jobs-api';
       await test_component_function_has_expected_rc_stdout_stderr(
-        `${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".name"`,
+        'echo $' + `(${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".name")`,
         {},
         {
           stdout: component,
@@ -103,7 +103,7 @@ describe('verify utils/component-utils', function() {
     it('test reading component commands.start', async function() {
       const component = 'jobs-api';
       await test_component_function_has_expected_rc_stdout_stderr(
-        `${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".commands.start"`,
+        'echo $' + `(${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".commands.start")`,
         {},
         {
           stdout: 'bin/start.sh',
@@ -114,7 +114,7 @@ describe('verify utils/component-utils', function() {
     it('test reading non-existing component manifest entry', async function() {
       const component = 'jobs-api';
       await test_component_function_has_expected_rc_stdout_stderr(
-        `${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".commands.somethingDoesNotExist"`,
+        'echo $' + `(${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".commands.somethingDoesNotExist")`,
         {},
         {
           stdout: 'null',
@@ -125,11 +125,11 @@ describe('verify utils/component-utils', function() {
     it('test reading component manifest entry with wrong definition', async function() {
       const component = 'jobs-api';
       await test_component_function_has_expected_rc_stdout_stderr(
-        `${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".commands[].start"`,
+        'echo $' + `(${read_component_manifest} "${process.env.ZOWE_ROOT_DIR}/components/${component}" ".commands[].start" 2>&1)`,
         {},
         {
-          rc: 1,
-          stderr: 'Error: Cannot iterate over object',
+          rc: 0,
+          stdout: 'Error: Cannot iterate over object',
         }
       );
     });