Disabled Azure tests, shuffled Fleet-152 (#305)

Signed-off-by: Satyajit Bulage <[email protected]>

Author: sbulage

tests/cypress/e2e/unit_tests/p0_fleet.spec.ts

@@ -52,13 +52,13 @@ describe('Test Fleet deployment on PUBLIC repos',  { tags: '@p0' }, () => {
 });
 
 describe('Test Fleet deployment on PRIVATE repos with HTTP auth', { tags: '@p0' }, () => {
-
+  //TODO: Commented Azure tests due to token expired, once restored uncomment it.
   const gitAuthType = "http"
   const repoTestData: testData[] = [
     {qase_id: 6, provider: 'GitLab',  repoUrl: 'https://gitlab.com/fleetqa/fleet-qa-examples.git'},
     {qase_id: 7, provider: 'Gh',  repoUrl: 'https://github.com/fleetqa/fleet-qa-examples.git'},
     {qase_id: 8, provider: 'Bitbucket', repoUrl: 'https://bitbucket.org/fleetqa-bb/fleet-qa-examples.git'},
-    {qase_id: 98, provider: 'Azure',  repoUrl: 'https://dev.azure.com/fleetqateam/fleet-qa-examples/_git/fleet-qa-examples'}
+    // {qase_id: 98, provider: 'Azure',  repoUrl: 'https://dev.azure.com/fleetqateam/fleet-qa-examples/_git/fleet-qa-examples'}
   ]
 
   repoTestData.forEach(({ qase_id, provider, repoUrl }) => {
@@ -81,15 +81,15 @@ describe('Test Fleet deployment on PRIVATE repos with HTTP auth', { tags: '@p0'
 });
 
 describe('Test Fleet deployment on PRIVATE repos with SSH auth', { tags: '@p0' }, () => {
-  
+  //TODO: Commented Azure tests due to token expired, once restored uncomment it.
   const gitAuthType = "ssh"
   const userOrPublicKey = Cypress.env("rsa_public_key_qa")
   const pwdOrPrivateKey = Cypress.env("rsa_private_key_qa")
   const repoTestData: testData[] = [
     {qase_id: 2, provider: 'GitLab', repoUrl: '[email protected]:fleetqa/fleet-qa-examples.git'},
     {qase_id: 3, provider: 'Bitbucket', repoUrl: '[email protected]:fleetqa-bb/fleet-qa-examples.git'},
     {qase_id: 4, provider: 'Github', repoUrl: '[email protected]:fleetqa/fleet-qa-examples.git'},
-    {qase_id: 97, provider: 'Azure', repoUrl: '[email protected]:v3/fleetqateam/fleet-qa-examples/fleet-qa-examples'}
+    // {qase_id: 97, provider: 'Azure', repoUrl: 'git@ssh.dev.azure.com:v3/fleetqateam/fleet-qa-examples/fleet-qa-examples'}
   ]
 
   repoTestData.forEach(({ qase_id, provider, repoUrl }) => {
@@ -218,6 +218,73 @@ describe('Test gitrepos with cabundle', { tags: '@p0' }, () => {
 
 });
 
+if (!/\/2\.7/.test(Cypress.env('rancher_version')) && !/\/2\.8/.test(Cypress.env('rancher_version'))) {
+  describe('Test Fleet with Webhook', { tags: '@p0' }, () => {
+    qase(152,
+      it('Fleet-152: Test Fleet with Webhook and disable polling ', { tags: '@fleet-152' }, () => {
+
+        const repoName = 'webhook-test-disable-polling';
+        const gh_private_pwd = Cypress.env('gh_private_pwd');
+
+        // Prepare webhook in Github
+        cy.exec('bash assets/webhook-tests/webhook_setup.sh', { env: { gh_private_pwd } }).then((result) => {
+          cy.log(result.stdout, result.stderr);
+        })
+
+        // Open local terminal in Rancher UI
+        cy.accesMenuSelection('local');
+        cy.get('#btn-kubectl').click();
+        cy.contains('Connected').should('be.visible');
+
+        // Add yaml file to the terminal to create ad-hoc ingress
+        cy.get('button > i.icon.icon-upload.icon-lg').click();
+        cy.addYamlFile('assets/webhook-tests/webhook_ingress.yaml');
+        cy.clickButton('Import');
+        cy.clickButton('Close');
+
+        cy.typeIntoCanvasTermnal('\
+        kubectl create secret generic gitjob-webhook -n cattle-fleet-system --from-literal=github=webhooksecretvalue{enter}');
+
+        // Ensure webhook repo starts with 2 replicas
+        cy.exec('bash assets/webhook-tests/webhook_test_2_replicas.sh', { env: { gh_private_pwd } }).then((result) => {
+          cy.log(result.stdout, result.stderr);
+        });
+
+        // Gitrepo creation via YAML
+        cy.accesMenuSelection('Continuous Delivery', 'Git Repos');
+        cy.fleetNamespaceToggle('fleet-local');
+        cy.clickButton('Add Repository');
+        cy.clickButton('Edit as YAML');
+        cy.addYamlFile('assets/webhook-tests/webhook_test_disable_polling.yaml');
+        cy.clickButton('Create');
+        cy.verifyTableRow(0, 'Active', '1/1');
+        cy.checkGitRepoStatus(repoName, '1 / 1', '1 / 1');
+        cy.verifyJobDeleted(repoName, false);
+
+        // Verify deployments has 2 replicas only
+        cy.accesMenuSelection('local', 'Workloads', 'Deployments');
+        cy.filterInSearchBox(repoName);
+        cy.wait(500);
+        cy.contains('tr.main-row', repoName, { timeout: 20000 }).should('be.visible');
+        cy.verifyTableRow(0, 'Active', '2/2');
+
+        // Give extra time for job to finsih. 
+        // TODO: remove this wait once https://github.com/rancher/fleet/issues/3067  is fixed
+        // or find a way to wait for the job to finish
+        cy.wait(10000);
+
+        // Change replicas to 5
+        cy.exec('bash assets/webhook-tests/webhook_test_5_replicas.sh').then((result) => {
+          cy.log(result.stdout, result.stderr);
+        });
+
+        // Verify deployments has 5 replicas
+        cy.verifyTableRow(0, 'Active', '5/5');
+      })
+    );
+  })
+};
+
 if (!/\/2\.7/.test(Cypress.env('rancher_version')) && !/\/2\.8/.test(Cypress.env('rancher_version'))) {
   // New tests for jobs cleanup
   describe('Test Fleet job cleanup', { tags: '@p0' }, () => {
@@ -327,73 +394,6 @@ if (!/\/2\.7/.test(Cypress.env('rancher_version')) && !/\/2\.8/.test(Cypress.env
   )});
 };
 
-if (!/\/2\.7/.test(Cypress.env('rancher_version')) && !/\/2\.8/.test(Cypress.env('rancher_version'))) {
-  describe('Test Fleet with Webhook', { tags: '@p0' }, () => {
-    qase(152,
-      it('Fleet-152: Test Fleet with Webhook and disable polling ', { tags: '@fleet-152' }, () => {
-
-        const repoName = 'webhook-test-disable-polling';
-        const gh_private_pwd = Cypress.env('gh_private_pwd');
-
-        // Prepare webhook in Github
-        cy.exec('bash assets/webhook-tests/webhook_setup.sh', { env: { gh_private_pwd } }).then((result) => {
-          cy.log(result.stdout, result.stderr);
-        })
-
-        // Open local terminal in Rancher UI
-        cy.accesMenuSelection('local');
-        cy.get('#btn-kubectl').click();
-        cy.contains('Connected').should('be.visible');
-
-        // Add yaml file to the terminal to create ad-hoc ingress
-        cy.get('button > i.icon.icon-upload.icon-lg').click();
-        cy.addYamlFile('assets/webhook-tests/webhook_ingress.yaml');
-        cy.clickButton('Import');
-        cy.clickButton('Close');
-
-        cy.typeIntoCanvasTermnal('\
-        kubectl create secret generic gitjob-webhook -n cattle-fleet-system --from-literal=github=webhooksecretvalue{enter}');
-
-        // Ensure webhook repo starts with 2 replicas
-        cy.exec('bash assets/webhook-tests/webhook_test_2_replicas.sh', { env: { gh_private_pwd } }).then((result) => {
-          cy.log(result.stdout, result.stderr);
-        });
-
-        // Gitrepo creation via YAML
-        cy.accesMenuSelection('Continuous Delivery', 'Git Repos');
-        cy.fleetNamespaceToggle('fleet-local');
-        cy.clickButton('Add Repository');
-        cy.clickButton('Edit as YAML');
-        cy.addYamlFile('assets/webhook-tests/webhook_test_disable_polling.yaml');
-        cy.clickButton('Create');
-        cy.verifyTableRow(0, 'Active', '1/1');
-        cy.checkGitRepoStatus(repoName, '1 / 1', '1 / 1');
-        cy.verifyJobDeleted(repoName, false);
-
-        // Verify deployments has 2 replicas only
-        cy.accesMenuSelection('local', 'Workloads', 'Deployments');
-        cy.filterInSearchBox(repoName);
-        cy.wait(500);
-        cy.contains('tr.main-row', repoName, { timeout: 20000 }).should('be.visible');
-        cy.verifyTableRow(0, 'Active', '2/2');
-
-        // Give extra time for job to finsih. 
-        // TODO: remove this wait once https://github.com/rancher/fleet/issues/3067  is fixed
-        // or find a way to wait for the job to finish
-        cy.wait(10000);
-
-        // Change replicas to 5
-        cy.exec('bash assets/webhook-tests/webhook_test_5_replicas.sh').then((result) => {
-          cy.log(result.stdout, result.stderr);
-        });
-
-        // Verify deployments has 5 replicas
-        cy.verifyTableRow(0, 'Active', '5/5');
-      })
-    );
-  })
-};
-
 if (!/\/2\.8/.test(Cypress.env('rancher_version')) && !/\/2\.9/.test(Cypress.env('rancher_version'))) {
   describe('Test GitJob security context',  { tags: '@p0' }, () => {
     qase(160,