Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node execution upgrade to Node10 #14014

Merged
merged 13 commits into from
Jan 7, 2021
423 changes: 380 additions & 43 deletions Tasks/AzureKeyVaultV1/npm-shrinkwrap.json

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions Tasks/AzureKeyVaultV1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
"name": "AzureKeyVault",
"main": "main.js",
"dependencies": {
"@types/node": "^6.0.101",
"@types/node": "^10.17.0",
"@types/mocha": "^5.2.7",
"@types/uuid": "^8.3.0",
"@types/q": "^1.5.0",
"azure-pipelines-tasks-azure-arm-rest-v2": "1.0.4",
"azure-pipelines-task-lib": "2.8.0",
"azure-pipelines-tasks-azure-arm-rest-v2": "2.0.0-preview.0",
"azure-pipelines-task-lib": "3.0.6-preview.0",
"moment": "2.21.0",
"vso-node-api": "6.0.1-preview"
},
"devDependencies": {
"typescript": "4.0.2"
}
}
8 changes: 4 additions & 4 deletions Tasks/AzureKeyVaultV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 175,
"Patch": 2
"Minor": 181,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "2.0.0",
Expand Down Expand Up @@ -74,12 +74,12 @@
],
"instanceNameFormat": "Azure Key Vault: $(KeyVaultName)",
"prejobexecution": {
"Node": {
"Node10": {
"target": "runprejob.js"
}
},
"execution": {
"Node": {
"Node10": {
"target": "run.js"
}
},
Expand Down
8 changes: 4 additions & 4 deletions Tasks/AzureKeyVaultV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 175,
"Patch": 2
"Minor": 181,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "2.0.0",
Expand Down Expand Up @@ -74,12 +74,12 @@
],
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
"prejobexecution": {
"Node": {
"Node10": {
"target": "runprejob.js"
}
},
"execution": {
"Node": {
"Node10": {
"target": "run.js"
}
},
Expand Down
24 changes: 12 additions & 12 deletions Tasks/ContainerBuildV0/Tests/L0.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe("ContainerBuildV0 Suite", function () {
});

// Docker build tests begin
it('Runs successfully for docker build', (done:MochaDone) => {
it('Runs successfully for docker build', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
Expand All @@ -59,7 +59,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for docker build with tags', (done:MochaDone) => {
it('Runs successfully for docker build with tags', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
process.env[shared.TestEnvVars.tags] = "tag1";
Expand All @@ -74,7 +74,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for docker build and push', (done:MochaDone) => {
it('Runs successfully for docker build and push', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "dockerhubendpoint";
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
Expand All @@ -90,7 +90,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for docker build and push with tags', (done:MochaDone) => {
it('Runs successfully for docker build and push with tags', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "dockerhubendpoint";
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
Expand All @@ -107,7 +107,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for docker build and push with mutiple tags', (done:MochaDone) => {
it('Runs successfully for docker build and push with mutiple tags', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "dockerhubendpoint";
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
Expand All @@ -125,7 +125,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for docker build when registry other than Docker hub is used', (done:MochaDone) => {
it('Runs successfully for docker build when registry other than Docker hub is used', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "acrendpoint";
process.env[shared.TestEnvVars.repository] = "testrepo";
Expand All @@ -141,7 +141,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for docker build when registry type is ACR and registry URL contains uppercase characters', (done:MochaDone) => {
it('Runs successfully for docker build when registry type is ACR and registry URL contains uppercase characters', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "acrendpoint2";
process.env[shared.TestEnvVars.repository] = "testrepo";
Expand All @@ -157,7 +157,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Docker build should honour Dockerfile and buildcontext input', (done:MochaDone) => {
it('Docker build should honour Dockerfile and buildcontext input', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
process.env[shared.TestEnvVars.dockerFile] = shared.formatPath("a/w/meta/Dockerfile");
Expand All @@ -174,7 +174,7 @@ describe("ContainerBuildV0 Suite", function () {
});

//buildctl
it('Buildctl should honour Dockerfile and buildcontext input', (done:MochaDone) => {
it('Buildctl should honour Dockerfile and buildcontext input', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env['RUNNING_ON'] = 'KUBERNETES';
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
Expand All @@ -191,7 +191,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Buildctl should perform build as well as push if dockerregistryserviceconnect is present', (done:MochaDone) => {
it('Buildctl should perform build as well as push if dockerregistryserviceconnect is present', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env['RUNNING_ON'] = 'KUBERNETES';
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "dockerhubendpoint";
Expand All @@ -209,7 +209,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for buildctl build and push with multiple tags', (done:MochaDone) => {
it('Runs successfully for buildctl build and push with multiple tags', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env['RUNNING_ON'] = 'KUBERNETES';
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "dockerhubendpoint";
Expand All @@ -227,7 +227,7 @@ describe("ContainerBuildV0 Suite", function () {
done();
});

it('Runs successfully for buildctl build when registry other than Docker hub is used', (done:MochaDone) => {
it('Runs successfully for buildctl build when registry other than Docker hub is used', (done:Mocha.Done) => {
let tp = path.join(__dirname, 'TestSetup.js');
process.env['RUNNING_ON'] = 'KUBERNETES';
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "acrendpoint";
Expand Down
Loading