Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
"sourceMaps": true,
"preLaunchTask": "instrument",
"env": {
"VSCODE_REDHAT_TELEMETRY_DEBUG":"true"
"VSCODE_REDHAT_TELEMETRY_DEBUG":"true",
"IS_OPENSHIFT": "true",
}
},
{
Expand Down
2 changes: 0 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ node('rhel8'){

withEnv(['TARGET=all']) {
stage('Package sources and ovsx package') {
packageJson.extensionDependencies << "ms-kubernetes-tools.vscode-kubernetes-tools"
writeJSON file: 'package.json', json: packageJson, pretty: 4
sh 'node ./out/build/update-readme.js'
sh "vsce package -o openshift-toolkit-${packageJson.version}-${env.BUILD_NUMBER}-ovsx.vsix"
sh "sha256sum *-ovsx.vsix > openshift-toolkit-${packageJson.version}-${env.BUILD_NUMBER}-ovsx.vsix.sha256"
Expand Down
3 changes: 2 additions & 1 deletion build/install-vscode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ void testElectron.downloadAndUnzipVSCode().then((executable: string) => {

// Install extensions that openshift-toolkit depends on
const extensionsToInstall = [
'redhat.vscode-redhat-account'
'redhat.vscode-redhat-account',
'ms-kubernetes-tools.vscode-kubernetes-tools'
];

const extensionRootPath = path.resolve(__dirname, '..', '..');
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,8 @@
]
},
"extensionDependencies": [
"redhat.vscode-redhat-account"
"redhat.vscode-redhat-account",
"ms-kubernetes-tools.vscode-kubernetes-tools"
],
"__metadata": {
"id": "8fea1f1f-b45c-4eea-b479-3a92c6e697d3",
Expand Down
1 change: 1 addition & 0 deletions test/unit/extension.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ suite('openshift toolkit Extension', () => {

test('Extension should be present', () => {
assert.ok(vscode.extensions.getExtension('redhat.vscode-openshift-connector'));
assert.ok(vscode.extensions.getExtension('ms-kubernetes-tools.vscode-kubernetes-tools'));
});

test('should register all extension commands declared commands in package descriptor', async function() {
Expand Down