Skip to content

Commit 4826894

Browse files
Deekshitha981nagarajkuDmitrii Bobreshev (Akvelon INC)
authored
Version Bump of azure-pipelines-tasks-docker-common (#19889)
* version bump of azure-pipelines-tasks-docker-common * Changed the package version for Node 20 * changed the execution nodes to 16 and 20. * Changing node version in Task.loc file * Reordering the node versions * [DockerComposeV0] - Restore Node10 handler - regenerated package-lock file on version 1 * [DockerComposeV0] - Add test output --------- Co-authored-by: nagarajku <[email protected]> Co-authored-by: Dmitrii Bobreshev (Akvelon INC) <[email protected]>
1 parent e48898f commit 4826894

File tree

19 files changed

+2595
-1383
lines changed

19 files changed

+2595
-1383
lines changed

Tasks/DockerComposeV0/Tests/L0.ts

+24-14
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ import * as assert from 'assert';
33
import * as ttm from 'azure-pipelines-task-lib/mock-test';
44
import tl = require('azure-pipelines-task-lib');
55

6+
function runValidations(validator: () => void, tr, done) {
7+
try {
8+
validator();
9+
done();
10+
}
11+
catch (error) {
12+
console.log("STDERR", tr.stderr);
13+
console.log("STDOUT", tr.stdout);
14+
done(error);
15+
}
16+
}
17+
618
describe('Docker Compose Suite', function() {
719
this.timeout(30000);
820
before((done) => {
@@ -27,13 +39,12 @@ describe('Docker Compose Suite', function() {
2739
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
2840
process.env["__command__"] = "Build services";
2941
tr.run();
30-
31-
assert(tr.invokedToolCount == 1, 'should have invoked tool one times. actual: ' + tr.invokedToolCount);
32-
assert(tr.stderr.length == 0 || tr.errorIssues.length, 'should not have written to stderr');
33-
assert(tr.succeeded, 'task should have succeeded');
34-
assert(tr.stdout.indexOf("[command]docker-compose -f F:\\dir2\\docker-compose.yml build") != -1, "docker compose build should run");
35-
console.log(tr.stderr);
36-
done();
42+
runValidations(() => {
43+
assert(tr.invokedToolCount == 1, 'should have invoked tool one times. actual: ' + tr.invokedToolCount);
44+
assert(tr.stderr.length == 0 || tr.errorIssues.length, 'should not have written to stderr');
45+
assert(tr.succeeded, 'task should have succeeded');
46+
assert(tr.stdout.indexOf("[command]docker-compose -f F:\\dir2\\docker-compose.yml build") != -1, "docker compose build should run");
47+
}, tr, done);
3748
});
3849

3950
it('Runs successfully for windows docker compose service build, using user defined dcoker compose exe', (done:Mocha.Done) => {
@@ -190,13 +201,12 @@ describe('Docker Compose Suite', function() {
190201
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
191202
process.env["__command__"] = "Build services";
192203
tr.run();
193-
194-
assert(tr.invokedToolCount == 1, 'should have invoked tool one times. actual: ' + tr.invokedToolCount);
195-
assert(tr.stderr.length == 0 || tr.errorIssues.length, 'should not have written to stderr');
196-
assert(tr.succeeded, 'task should have succeeded');
197-
assert(tr.stdout.indexOf("[command]docker-compose -f /tmp/tempdir/100/docker-compose.yml build") != -1, "docker compose build should run");
198-
console.log(tr.stderr);
199-
done();
204+
runValidations(() => {
205+
assert(tr.invokedToolCount == 1, 'should have invoked tool one times. actual: ' + tr.invokedToolCount);
206+
assert(tr.stderr.length == 0 || tr.errorIssues.length, 'should not have written to stderr');
207+
assert(tr.succeeded, 'task should have succeeded');
208+
assert(tr.stdout.indexOf("[command]docker-compose -f /tmp/tempdir/100/docker-compose.yml build") != -1, "docker compose build should run");
209+
}, tr, done);
200210
});
201211

202212
it('Runs successfully for linux docker compose service build, using user defined dcoker compose path', (done:Mocha.Done) => {

Tasks/DockerComposeV0/_buildConfigs/Node20/package-lock.json

+39-36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/DockerComposeV0/_buildConfigs/Node20/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"@types/q": "^1.5.0",
66
"agent-base": "^6.0.2",
77
"azure-pipelines-task-lib": "4.4.0",
8-
"azure-pipelines-tasks-docker-common": "2.225.0",
8+
"azure-pipelines-tasks-docker-common": "2.226.0",
99
"del": "2.2.0",
1010
"esprima": "2.7.1",
1111
"js-yaml": "3.13.1"

0 commit comments

Comments
 (0)