diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index db84a5c67..eb1c23ed7 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -58,17 +58,17 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} TEST_GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }} - TEST_GITHUB_REPO: https://github.com/iterative/cml_qa_tests_dummy - TEST_GITHUB_SHA: 0cd16da26e35f8e5d57b2549a97e22618abf08f6 - TEST_GITHUB_ISSUE: 1 + TEST_GITHUB_REPOSITORY: ${{ vars.TEST_GITHUB_REPOSITORY }} + TEST_GITHUB_COMMIT: ${{ vars.TEST_GITHUB_COMMIT }} + TEST_GITHUB_ISSUE: ${{ vars.TEST_GITHUB_ISSUE }} TEST_GITLAB_TOKEN: ${{ secrets.TEST_GITLAB_TOKEN }} - TEST_GITLAB_REPO: https://gitlab.com/iterative.ai/cml_qa_tests_dummy - TEST_GITLAB_SHA: f8b8b49a253243830ef59a7f090eb887157b2b67 - TEST_GITLAB_ISSUE: 1 + TEST_GITLAB_REPOSITORY: ${{ vars.TEST_GITLAB_REPOSITORY }} + TEST_GITLAB_COMMIT: ${{ vars.TEST_GITLAB_COMMIT }} + TEST_GITLAB_ISSUE: ${{ vars.TEST_GITLAB_ISSUE }} TEST_BITBUCKET_TOKEN: ${{ secrets.TEST_BITBUCKET_TOKEN }} - TEST_BITBUCKET_REPO: https://bitbucket.org/iterative-ai/cml-qa-tests-dummy - TEST_BITBUCKET_SHA: b511535a89f76d3d311b1c15e3e712b15c0b94e3 - TEST_BITBUCKET_ISSUE: 1 + TEST_BITBUCKET_REPOSITORY: ${{ vars.TEST_BITBUCKET_REPOSITORY }} + TEST_BITBUCKET_COMMIT: ${{ vars.TEST_BITBUCKET_COMMIT }} + TEST_BITBUCKET_ISSUE: ${{ vars.TEST_BITBUCKET_ISSUE }} test-os: needs: authorize name: test-${{ matrix.system }} diff --git a/bin/cml/asset/publish.e2e.test.js b/bin/cml/asset/publish.e2e.test.js index f4a43ce31..21d84de2b 100644 --- a/bin/cml/asset/publish.e2e.test.js +++ b/bin/cml/asset/publish.e2e.test.js @@ -110,7 +110,8 @@ describe('CML e2e', () => { }); test('cml publish assets/test.svg in Gitlab storage', async () => { - const { TEST_GITLAB_REPO: repo, TEST_GITLAB_TOKEN: token } = process.env; + const { TEST_GITLAB_REPOSITORY: repo, TEST_GITLAB_TOKEN: token } = + process.env; const output = await exec( 'node', diff --git a/bin/cml/comment/create.e2e.test.js b/bin/cml/comment/create.e2e.test.js index c37073898..26219cbc5 100644 --- a/bin/cml/comment/create.e2e.test.js +++ b/bin/cml/comment/create.e2e.test.js @@ -12,9 +12,9 @@ describe('Comment integration tests', () => { test('cml send-comment to specific repo', async () => { const { - TEST_GITHUB_REPO: repo, + TEST_GITHUB_REPOSITORY: repo, TEST_GITHUB_TOKEN: token, - TEST_GITHUB_SHA: sha + TEST_GITHUB_COMMIT: sha } = process.env; const report = `## Test Comment Report specific`; diff --git a/bin/cml/runner/launch.e2e.test.js b/bin/cml/runner/launch.e2e.test.js index 3235fb41f..3c596274b 100644 --- a/bin/cml/runner/launch.e2e.test.js +++ b/bin/cml/runner/launch.e2e.test.js @@ -7,9 +7,9 @@ const { exec, sshConnection, randid, sleep } = require('../../../src/utils'); const IDLE_TIMEOUT = 15; const { TEST_GITHUB_TOKEN, - TEST_GITHUB_REPO, + TEST_GITHUB_REPOSITORY, TEST_GITLAB_TOKEN, - TEST_GITLAB_REPO, + TEST_GITLAB_REPOSITORY, SSH_PRIVATE } = process.env; @@ -70,7 +70,7 @@ const testRunner = async (opts) => { describe('CML e2e', () => { test.skip('cml-runner GL/AWS', async () => { const opts = { - repo: TEST_GITLAB_REPO, + repo: TEST_GITLAB_REPOSITORY, token: TEST_GITLAB_TOKEN, privateKey: SSH_PRIVATE, cloud: 'aws', @@ -83,7 +83,7 @@ describe('CML e2e', () => { test.skip('cml-runner GH/AWS', async () => { const opts = { - repo: TEST_GITHUB_REPO, + repo: TEST_GITHUB_REPOSITORY, token: TEST_GITHUB_TOKEN, privateKey: SSH_PRIVATE, cloud: 'aws', @@ -96,7 +96,7 @@ describe('CML e2e', () => { test.skip('cml-runner GL/Azure', async () => { const opts = { - repo: TEST_GITLAB_REPO, + repo: TEST_GITLAB_REPOSITORY, token: TEST_GITLAB_TOKEN, privateKey: SSH_PRIVATE, cloud: 'azure', @@ -109,7 +109,7 @@ describe('CML e2e', () => { test.skip('cml-runner GH/Azure', async () => { const opts = { - repo: TEST_GITHUB_REPO, + repo: TEST_GITHUB_REPOSITORY, token: TEST_GITHUB_TOKEN, privateKey: SSH_PRIVATE, cloud: 'azure', @@ -122,7 +122,7 @@ describe('CML e2e', () => { test.skip('cml-runner GL/GCP', async () => { const opts = { - repo: TEST_GITLAB_REPO, + repo: TEST_GITLAB_REPOSITORY, token: TEST_GITLAB_TOKEN, privateKey: SSH_PRIVATE, cloud: 'gcp', @@ -135,7 +135,7 @@ describe('CML e2e', () => { test.skip('cml-runner GH/GCP', async () => { const opts = { - repo: TEST_GITHUB_REPO, + repo: TEST_GITHUB_REPOSITORY, token: TEST_GITHUB_TOKEN, privateKey: SSH_PRIVATE, cloud: 'gcp', diff --git a/src/analytics.e2e.test.js b/src/analytics.e2e.test.js index 365bba3ac..23414bde0 100644 --- a/src/analytics.e2e.test.js +++ b/src/analytics.e2e.test.js @@ -1,7 +1,7 @@ const { send, jitsuEventPayload, isCI } = require('./analytics'); const CML = require('../src/cml').default; -const { TEST_GITHUB_TOKEN: TOKEN, TEST_GITHUB_REPO: REPO } = process.env; +const { TEST_GITHUB_TOKEN: TOKEN, TEST_GITHUB_REPOSITORY: REPO } = process.env; describe('analytics tests', () => { test('userId', async () => { diff --git a/src/cml.e2e.test.js b/src/cml.e2e.test.js index 535a4779c..02d19d953 100644 --- a/src/cml.e2e.test.js +++ b/src/cml.e2e.test.js @@ -5,8 +5,8 @@ describe('Github tests', () => { const { TEST_GITHUB_TOKEN: TOKEN, - TEST_GITHUB_REPO: REPO, - TEST_GITHUB_SHA: SHA + TEST_GITHUB_REPOSITORY: REPO, + TEST_GITHUB_COMMIT: SHA } = process.env; beforeEach(() => { @@ -116,8 +116,8 @@ describe('Gitlab tests', () => { const { TEST_GITLAB_TOKEN: TOKEN, - TEST_GITLAB_REPO: REPO, - TEST_GITLAB_SHA: SHA + TEST_GITLAB_REPOSITORY: REPO, + TEST_GITLAB_COMMIT: SHA } = process.env; beforeEach(() => { diff --git a/src/cml.js b/src/cml.js index 95df80442..b6146d82d 100644 --- a/src/cml.js +++ b/src/cml.js @@ -570,7 +570,7 @@ class CML { ) ); - const paths = (await globby(globs)).filter((path) => + const paths = (await globby(globs, { dot: true })).filter((path) => files.map((file) => file.path).includes(prefix + path) ); diff --git a/src/drivers/bitbucket_cloud.e2e.test.js b/src/drivers/bitbucket_cloud.e2e.test.js index 60cd615b0..6cf46ca9b 100644 --- a/src/drivers/bitbucket_cloud.e2e.test.js +++ b/src/drivers/bitbucket_cloud.e2e.test.js @@ -1,8 +1,8 @@ const BitbucketCloud = require('./bitbucket_cloud'); const { TEST_BITBUCKET_TOKEN: TOKEN, - TEST_BITBUCKET_REPO: REPO, - TEST_BITBUCKET_SHA: SHA, + TEST_BITBUCKET_REPOSITORY: REPO, + TEST_BITBUCKET_COMMIT: SHA, TEST_BITBUCKET_ISSUE: ISSUE = 1 } = process.env; diff --git a/src/drivers/github.e2e.test.js b/src/drivers/github.e2e.test.js index e2cc9ee88..930152449 100644 --- a/src/drivers/github.e2e.test.js +++ b/src/drivers/github.e2e.test.js @@ -2,8 +2,8 @@ const GithubClient = require('./github'); const { TEST_GITHUB_TOKEN: TOKEN, - TEST_GITHUB_REPO: REPO, - TEST_GITHUB_SHA: SHA, + TEST_GITHUB_REPOSITORY: REPO, + TEST_GITHUB_COMMIT: SHA, TEST_GITHUB_ISSUE: ISSUE = 1 } = process.env; diff --git a/src/drivers/gitlab.e2e.test.js b/src/drivers/gitlab.e2e.test.js index c3212b6a3..6660951ae 100644 --- a/src/drivers/gitlab.e2e.test.js +++ b/src/drivers/gitlab.e2e.test.js @@ -2,8 +2,8 @@ const GitlabClient = require('./gitlab'); const { TEST_GITLAB_TOKEN: TOKEN, - TEST_GITLAB_REPO: REPO, - TEST_GITLAB_SHA: SHA, + TEST_GITLAB_REPOSITORY: REPO, + TEST_GITLAB_COMMIT: SHA, TEST_GITLAB_ISSUE: ISSUE = 1 } = process.env;