From 73cac5191ec00d1997964becd23ac4f3d59314f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Mart=C3=ADn?= Date: Mon, 25 Mar 2024 11:44:12 +0100 Subject: [PATCH] Implementing Azure devops http private repo test (#77) * Implementing Azure devops http private repo test * adding missing credentials. correcting small typo * adding az variable into docker script * Fixing typo on test number --- .github/workflows/master-e2e.yaml | 8 ++++++++ .github/workflows/ui-pr_rm_head_2.8.yaml | 4 +++- .github/workflows/ui-rm_head_2.7.yaml | 2 ++ .github/workflows/ui-rm_head_2.8.yaml | 2 ++ .github/workflows/ui-rm_head_2.9.yaml | 2 ++ tests/cypress/e2e/unit_tests/p0_fleet.spec.ts | 18 ++++++++++++++++++ tests/cypress/plugins/index.ts | 2 ++ tests/scripts/start-cypress-tests | 2 ++ 8 files changed, 39 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master-e2e.yaml b/.github/workflows/master-e2e.yaml index f2ebb06..b3d6ff4 100644 --- a/.github/workflows/master-e2e.yaml +++ b/.github/workflows/master-e2e.yaml @@ -38,6 +38,12 @@ on: gh_private_pwd: description: Github password for private repo tests required: false + azure_private_user: + description: Azure username for private repo tests + required: false + azure_private_pwd: + description: Azure password for private repo tests + required: false qase_api_token: description: Qase API token to use for Qase reporting required: true @@ -258,6 +264,8 @@ jobs: BITBUCKET_PRIVATE_PWD: ${{ secrets.bitbucket_private_pwd }} GH_PRIVATE_USER: ${{ secrets.gh_private_user }} GH_PRIVATE_PWD: ${{ secrets.gh_private_pwd }} + AZURE_PRIVATE_USER: ${{ secrets.azure_private_user }} + AZURE_PRIVATE_PWD: ${{ secrets.azure_private_pwd }} GREPTAGS: ${{ inputs.grep_test_by_tag }} # Add /workdir/e2e/unit_tests/user.spec.ts again when implementing RBAC tests. SPEC: | diff --git a/.github/workflows/ui-pr_rm_head_2.8.yaml b/.github/workflows/ui-pr_rm_head_2.8.yaml index cc0d6ee..9e4c3d7 100644 --- a/.github/workflows/ui-pr_rm_head_2.8.yaml +++ b/.github/workflows/ui-pr_rm_head_2.8.yaml @@ -24,7 +24,9 @@ jobs: bitbucket_private_user: ${{ secrets.BITBUCKET_PRIVATE_USER }} bitbucket_private_pwd: ${{ secrets.BITBUCKET_PRIVATE_PWD }} gh_private_user: ${{ secrets.GH_PRIVATE_USER }} - gH_private_pwd: ${{ secrets.GH_PRIVATE_PWD }} + gh_private_pwd: ${{ secrets.GH_PRIVATE_PWD }} + azure_private_user: ${{ secrets.AZURE_PRIVATE_USER }} + azure_private_pwd: ${{ secrets.AZURE_PRIVATE_PWD }} qase_api_token: ${{ secrets.QASE_API_TOKEN }} with: test_description: "CI test for PR#${{ github.event.pull_request.number }} with K3s" diff --git a/.github/workflows/ui-rm_head_2.7.yaml b/.github/workflows/ui-rm_head_2.7.yaml index be6ba5d..933cc1a 100644 --- a/.github/workflows/ui-rm_head_2.7.yaml +++ b/.github/workflows/ui-rm_head_2.7.yaml @@ -43,6 +43,8 @@ jobs: bitbucket_private_pwd: ${{ secrets.BITBUCKET_PRIVATE_PWD }} gh_private_user: ${{ secrets.GH_PRIVATE_USER }} gh_private_pwd: ${{ secrets.GH_PRIVATE_PWD }} + azure_private_user: ${{ secrets.AZURE_PRIVATE_USER }} + azure_private_pwd: ${{ secrets.AZURE_PRIVATE_PWD }} qase_api_token: ${{ secrets.QASE_API_TOKEN }} with: test_description: "CI/Manual - UI - Deployment test with Standard K3s" diff --git a/.github/workflows/ui-rm_head_2.8.yaml b/.github/workflows/ui-rm_head_2.8.yaml index feba8e7..9540626 100644 --- a/.github/workflows/ui-rm_head_2.8.yaml +++ b/.github/workflows/ui-rm_head_2.8.yaml @@ -43,6 +43,8 @@ jobs: bitbucket_private_pwd: ${{ secrets.BITBUCKET_PRIVATE_PWD }} gh_private_user: ${{ secrets.GH_PRIVATE_USER }} gh_private_pwd: ${{ secrets.GH_PRIVATE_PWD }} + azure_private_user: ${{ secrets.AZURE_PRIVATE_USER }} + azure_private_pwd: ${{ secrets.AZURE_PRIVATE_PWD }} qase_api_token: ${{ secrets.QASE_API_TOKEN }} with: test_description: "CI/Manual - UI - Deployment test with Standard K3s" diff --git a/.github/workflows/ui-rm_head_2.9.yaml b/.github/workflows/ui-rm_head_2.9.yaml index 0e7af75..d00bedd 100644 --- a/.github/workflows/ui-rm_head_2.9.yaml +++ b/.github/workflows/ui-rm_head_2.9.yaml @@ -43,6 +43,8 @@ jobs: bitbucket_private_pwd: ${{ secrets.BITBUCKET_PRIVATE_PWD }} gh_private_user: ${{ secrets.GH_PRIVATE_USER }} gh_private_pwd: ${{ secrets.GH_PRIVATE_PWD }} + azure_private_user: ${{ secrets.AZURE_PRIVATE_USER }} + azure_private_pwd: ${{ secrets.AZURE_PRIVATE_PWD }} qase_api_token: ${{ secrets.QASE_API_TOKEN }} with: test_description: "CI/Manual - UI - Deployment test with Standard K3s" diff --git a/tests/cypress/e2e/unit_tests/p0_fleet.spec.ts b/tests/cypress/e2e/unit_tests/p0_fleet.spec.ts index 048d6ad..89fd8fc 100644 --- a/tests/cypress/e2e/unit_tests/p0_fleet.spec.ts +++ b/tests/cypress/e2e/unit_tests/p0_fleet.spec.ts @@ -103,6 +103,24 @@ describe('Fleet Deployment Test Cases', { tags: '@p0' }, () => { }) ); + qase(98, + it('FLEET-98: Test AZURE DEVOPS Private Repository to install NGINX app using HTTP auth', { tags: '@fleet-98' }, () => { + const repoName = "default-cluster-fleet-52" + const branch = "main" + const path = "nginx-helm" + const repoUrl = "https://dev.azure.com/mamartin0216/_git/mamartin" + const gitAuthType = "http" + const userOrPublicKey = Cypress.env("azure_private_user"); + const pwdOrPrivateKey = Cypress.env("azure_private_pwd"); + + cy.fleetNamespaceToggle('fleet-default') + cy.addFleetGitRepo({ repoName, repoUrl, branch, path, gitAuthType, userOrPublicKey, pwdOrPrivateKey }); + cy.clickButton('Create'); + cy.open3dotsMenu(repoName, 'Force Update'); + cy.checkGitRepoStatus(repoName, '1 / 1', '1 / 1') + cy.deleteAllFleetRepos(); + }) + ); }); diff --git a/tests/cypress/plugins/index.ts b/tests/cypress/plugins/index.ts index f6e079c..cc4c51f 100644 --- a/tests/cypress/plugins/index.ts +++ b/tests/cypress/plugins/index.ts @@ -41,6 +41,8 @@ module.exports = (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions) config.env.bitbucket_private_pwd = process.env.BITBUCKET_PRIVATE_PWD; config.env.gh_private_user = process.env.GH_PRIVATE_USER; config.env.gh_private_pwd = process.env.GH_PRIVATE_PWD; + config.env.azure_private_user = process.env.AZURE_PRIVATE_USER; + config.env.azure_private_pwd = process.env.AZURE_PRIVATE_PWD; config.env.grep = process.env.GREP; config.env.grepTags = process.env.GREPTAGS; diff --git a/tests/scripts/start-cypress-tests b/tests/scripts/start-cypress-tests index de3786f..3ebea56 100755 --- a/tests/scripts/start-cypress-tests +++ b/tests/scripts/start-cypress-tests @@ -23,6 +23,8 @@ docker run --init -v $PWD:/workdir -w /workdir \ -e BITBUCKET_PRIVATE_PWD=$BITBUCKET_PRIVATE_PWD \ -e GH_PRIVATE_USER=$GH_PRIVATE_USER \ -e GH_PRIVATE_PWD=$GH_PRIVATE_PWD \ + -e AZURE_PRIVATE_USER=$AZURE_PRIVATE_USER \ + -e AZURE_PRIVATE_PWD=$AZURE_PRIVATE_PWD \ -e "GREP=$GREP" \ -e "GREPTAGS=$GREPTAGS" \ --add-host host.docker.internal:host-gateway \