Merge branch 'main' into nikola-jokic/computed-build-directory

This commit is contained in:
Nikola Jokic
2022-06-07 10:52:28 +02:00
committed by GitHub
5 changed files with 21 additions and 28 deletions

View File

@@ -46,13 +46,6 @@ describe('cleanup job', () => {
})
it('should cleanup successfully', async () => {
const prepareJobOutputContent = fs.readFileSync(
prepareJobOutputPath,
'utf-8'
)
const parsedPrepareJobOutput = JSON.parse(prepareJobOutputContent)
await expect(
cleanupJob(prepareJobDefinition.args, parsedPrepareJobOutput.state, null)
).resolves.not.toThrow()
await expect(cleanupJob()).resolves.not.toThrow()
})
})

View File

@@ -82,7 +82,7 @@ describe('e2e', () => {
await expect(
runContainerStep(runContainerStepDefinition.args, resp.state)
).resolves.not.toThrow()
await expect(cleanupJob(resp, resp.state, null)).resolves.not.toThrow()
await expect(cleanupJob()).resolves.not.toThrow()
})
it('should prepare job, then run script step, then run container step with Dockerfile then cleanup', async () => {
@@ -111,6 +111,6 @@ ENTRYPOINT [ "tail", "-f", "/dev/null" ]
await expect(
runContainerStep(containerStepDataCopy.args, resp.state)
).resolves.not.toThrow()
await expect(cleanupJob(resp, resp.state, null)).resolves.not.toThrow()
await expect(cleanupJob()).resolves.not.toThrow()
})
})