Skip to content

Commit 53f72c0

Browse files
authored
Node execution upgrade to Node10 (#14014) (#14186)
* AzureKeyVaultV1 * ContainerBuildV0 * DuffleInstallerV0 * Execution: Node10 AzureKeyVault and ContainerBuild * GitHubReleaseV0 * GitHubReleaseV1 * KubernetesManifestV0 * Updating common modules to preview * DockerComposeV0 * DockerInstallerV0 * MochaDone to Mocha.Done
1 parent cdc35bd commit 53f72c0

40 files changed

+3226
-495
lines changed

Tasks/AzureKeyVaultV1/npm-shrinkwrap.json

Lines changed: 380 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureKeyVaultV1/package.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22
"name": "AzureKeyVault",
33
"main": "main.js",
44
"dependencies": {
5-
"@types/node": "^6.0.101",
5+
"@types/node": "^10.17.0",
6+
"@types/mocha": "^5.2.7",
7+
"@types/uuid": "^8.3.0",
68
"@types/q": "^1.5.0",
7-
"azure-pipelines-tasks-azure-arm-rest-v2": "1.0.4",
8-
"azure-pipelines-task-lib": "2.8.0",
9+
"azure-pipelines-tasks-azure-arm-rest-v2": "2.0.0-preview.0",
10+
"azure-pipelines-task-lib": "3.0.6-preview.0",
911
"moment": "2.21.0",
1012
"vso-node-api": "6.0.1-preview"
13+
},
14+
"devDependencies": {
15+
"typescript": "4.0.2"
1116
}
1217
}

Tasks/AzureKeyVaultV1/task.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"author": "Microsoft Corporation",
1515
"version": {
1616
"Major": 1,
17-
"Minor": 175,
18-
"Patch": 2
17+
"Minor": 181,
18+
"Patch": 0
1919
},
2020
"demands": [],
2121
"minimumAgentVersion": "2.0.0",
@@ -74,12 +74,12 @@
7474
],
7575
"instanceNameFormat": "Azure Key Vault: $(KeyVaultName)",
7676
"prejobexecution": {
77-
"Node": {
77+
"Node10": {
7878
"target": "runprejob.js"
7979
}
8080
},
8181
"execution": {
82-
"Node": {
82+
"Node10": {
8383
"target": "run.js"
8484
}
8585
},

Tasks/AzureKeyVaultV1/task.loc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"author": "Microsoft Corporation",
1515
"version": {
1616
"Major": 1,
17-
"Minor": 175,
18-
"Patch": 2
17+
"Minor": 181,
18+
"Patch": 0
1919
},
2020
"demands": [],
2121
"minimumAgentVersion": "2.0.0",
@@ -74,12 +74,12 @@
7474
],
7575
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
7676
"prejobexecution": {
77-
"Node": {
77+
"Node10": {
7878
"target": "runprejob.js"
7979
}
8080
},
8181
"execution": {
82-
"Node": {
82+
"Node10": {
8383
"target": "run.js"
8484
}
8585
},

Tasks/ContainerBuildV0/Tests/L0.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe("ContainerBuildV0 Suite", function () {
4545
});
4646

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

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

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

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

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)