Skip to content

Commit eccb2cf

Browse files
authored
Added WIF support to ContainerBuildV0 (#19916)
1 parent cc32b87 commit eccb2cf

27 files changed

+1895
-928
lines changed

Tasks/ContainerBuildV0/Tests/L0.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe("ContainerBuildV0 Suite", function () {
1818
process.env[shared.TestEnvVars.operatingSystem] = tl.osType().match(/^Win/) ? shared.OperatingSystems.Windows : shared.OperatingSystems.Other;
1919
done();
2020
});
21-
21+
2222
beforeEach(() => {
2323
delete process.env[shared.TestEnvVars.runningOn];
2424
delete process.env[shared.TestEnvVars.dockerRegistryServiceConnection];
@@ -27,7 +27,7 @@ describe("ContainerBuildV0 Suite", function () {
2727
delete process.env[shared.TestEnvVars.buildContext];
2828
delete process.env[shared.TestEnvVars.tags];
2929
});
30-
30+
3131
after(function () {
3232
delete process.env['SYSTEM_TEAMFOUNDATIONCOLLECTIONURI'];
3333
delete process.env['BUILD_SOURCEVERSION'];
@@ -159,7 +159,7 @@ describe("ContainerBuildV0 Suite", function () {
159159

160160
it('Docker build should honour Dockerfile and buildcontext input', (done:Mocha.Done) => {
161161
let tp = path.join(__dirname, 'TestSetup.js');
162-
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
162+
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
163163
process.env[shared.TestEnvVars.dockerFile] = shared.formatPath("a/w/meta/Dockerfile");
164164
process.env[shared.TestEnvVars.buildContext] = shared.formatPath("a/w/context");
165165
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
@@ -177,7 +177,7 @@ describe("ContainerBuildV0 Suite", function () {
177177
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';
180-
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
180+
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
181181
process.env[shared.TestEnvVars.dockerFile] = shared.formatPath("a/w/meta/Dockerfile");
182182
process.env[shared.TestEnvVars.buildContext] = shared.formatPath("a/w/context");
183183
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
@@ -195,7 +195,7 @@ describe("ContainerBuildV0 Suite", function () {
195195
let tp = path.join(__dirname, 'TestSetup.js');
196196
process.env['RUNNING_ON'] = 'KUBERNETES';
197197
process.env[shared.TestEnvVars.dockerRegistryServiceConnection] = "dockerhubendpoint";
198-
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
198+
process.env[shared.TestEnvVars.repository] = "testuser/testrepo";
199199
process.env[shared.TestEnvVars.dockerFile] = shared.formatPath("a/w/meta/Dockerfile");
200200
process.env[shared.TestEnvVars.buildContext] = shared.formatPath("a/w/context");
201201
let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
@@ -249,13 +249,13 @@ describe("ContainerBuildV0 Suite", function () {
249249
ring.addNode("buildkitd-1");
250250
ring.addNode("buildkitd-2");
251251
var chosenbuildkitpod = ring.getNode("testrepoF:\a\w\meta\Dockerfile");
252-
252+
253253
// can return different pod for different key
254254
assert(chosenbuildkitpod,"buildkitd-2");
255255
var chosenbuildkitpod1 = ring.getNode("testuser\testrepoF:\a\w\meta\Dockerfile");
256-
256+
257257
assert(chosenbuildkitpod1,"buildkitd-0");
258-
258+
259259
// must return same pod if same key given
260260
var chosenbuildkitpod3 = ring.getNode("testrepoF:\a\w\meta\Dockerfile");
261261
assert(chosenbuildkitpod3,"buildkitd-2");

Tasks/ContainerBuildV0/Tests/TestSetup.ts

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ process.env["RELEASE_RELEASENAME"] = "Release-1";
3131
process.env["SYSTEM_DEFAULTWORKINGDIRECTORY"] = DefaultWorkingDirectory;
3232
process.env["SYSTEM_HOSTTYPE"] = process.env[shared.TestEnvVars.hostType] || shared.HostTypes.build;
3333
process.env["SYSTEM_SERVERTYPE"] = "hosted";
34+
process.env['AGENT_TEMPDIRECTORY'] = '.';
3435
process.env["ENDPOINT_AUTH_dockerhubendpoint"] = "{\"parameters\":{\"username\":\"testuser\", \"password\":\"regpassword\", \"email\":\"[email protected]\",\"registry\":\"https://index.docker.io/v1/\"},\"scheme\":\"UsernamePassword\"}";
3536
// Docker registry endpoint with ACR registrytype
3637
process.env["ENDPOINT_AUTH_PARAMETER_acrendpoint_serviceprincipalid"] = "testspn";

Tasks/ContainerBuildV0/_buildConfigs/Node20/Tests/package-lock.json

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

0 commit comments

Comments
 (0)