fix 2 issues found during testing (#8029)

This commit is contained in:
Alan Ren
2019-10-25 13:54:19 -07:00
committed by GitHub
parent e191556d3b
commit e4b0371b2a
2 changed files with 5 additions and 8 deletions

View File

@@ -77,10 +77,7 @@
" !{command}\n", " !{command}\n",
" if _exit_code != 0:\n", " if _exit_code != 0:\n",
" sys.exit(f'Command execution failed with exit code: {str(_exit_code)}.\\n\\t{command}\\n')\n", " sys.exit(f'Command execution failed with exit code: {str(_exit_code)}.\\n\\t{command}\\n')\n",
" print(f'Successfully executed: {command}')\n", " print(f'Successfully executed: {command}')"
"\n",
"run_command('kubectl version --client=true')\n",
"run_command('azdata --version')"
], ],
"metadata": { "metadata": {
"azdata_cell_guid": "26fa8bc4-4b8e-4c31-ae11-50484821cea8", "azdata_cell_guid": "26fa8bc4-4b8e-4c31-ae11-50484821cea8",

View File

@@ -163,7 +163,7 @@ export class DeployClusterWizardModel extends Model {
statements.push(`os.environ["DOCKER_USERNAME"] = '${this.getStringValue(VariableNames.DockerUsername_VariableName)}'`); statements.push(`os.environ["DOCKER_USERNAME"] = '${this.getStringValue(VariableNames.DockerUsername_VariableName)}'`);
statements.push(`os.environ["DOCKER_PASSWORD"] = os.environ["${VariableNames.DockerPassword_VariableName}"]`); statements.push(`os.environ["DOCKER_PASSWORD"] = os.environ["${VariableNames.DockerPassword_VariableName}"]`);
} }
statements.push(`os.environ["PATH"] = os.environ["PATH"] + "${delimiter}" + "${process.env[VariableNames.ToolsInstallPath]}"`); statements.push(`os.environ["PATH"] = os.environ["PATH"] + "${delimiter}" + "${this.escapeForNotebookCodeCell(process.env[VariableNames.ToolsInstallPath]!)}"`);
statements.push(`print('Variables have been set successfully.')`); statements.push(`print('Variables have been set successfully.')`);
return statements.map(line => line + EOL); return statements.map(line => line + EOL);
} }