Merge branch 'improvement/remove-the-solution-test-and-drop-the-page'…

… into tmp/octopus/w/2.9/improvement/remove-the-solution-test-and-drop-the-page

CHANGELOG.md

@@ -64,6 +64,11 @@
   Salt dependencies from "base" RHEL 7 repository
   (PR [#3083](https://github.com/scality/metalk8s/pull/3083))
 
+### Deprecations and Removals
+
+- [#3168](https://github.com/scality/metalk8s/issues/3168) - [UI] Remove the environment page
+  (PR [#3167](https://github.com/scality/metalk8s/pull/3167))
+
 ## Release 2.7.4 (in development)
 
 ## Release 2.7.3

eve/main.yml

@@ -2521,30 +2521,6 @@ stages:
           env:
             <<: *_env_bastion_tests
             PYTEST_FILTERS: "solution"
-      - SetPropertyFromCommand: *set_bootstrap_cp_ip_ssh
-      - ShellCommand: &import_solution_archive_ssh
-          name: Import Solution example-solution archive
-          env:
-            SOLUTION_ARCHIVE: /var/tmp/example-solution.iso
-          command: >
-            ssh -F ssh_config bootstrap
-            sudo /var/tmp/metalk8s/solutions.sh
-            import --archive "$SOLUTION_ARCHIVE"
-          workdir: build/eve/workers/openstack-terraform/terraform/
-          haltOnFailure: true
-      - ShellCommand:
-          <<: *import_solution_archive_ssh
-          name: Import Solution next example-solution archive
-          env:
-            SOLUTION_ARCHIVE: /var/tmp/example-solution-next.iso
-      - ShellCommand:
-          <<: *bastion_ui_tests
-          name: Run Solutions UI tests
-          env:
-            <<: *_env_bastion_ui_tests
-            TEST_FILTER: "e2esolutions"
-      - ShellCommand: *collect_cypress_result_ssh
-      - Upload: *upload_cypress_artifacts
       - ShellCommand: *generate_report_over_ssh
       - ShellCommand:
           <<: *collect_report_over_ssh

ui/cypress/integration/sidebar.spec.js

@@ -30,12 +30,6 @@ describe('Sidebar', () => {
     cy.get('@historyPush').should('be.calledWith', '/volumes');
   });
 
-  it('brings me to the environment page', () => {
-    cy.get('[data-cy="sidebar_item_environments"]').click();
-
-    cy.get('@historyPush').should('be.calledWith', '/environments');
-  });
-
   it('can be expanded', () => {
     cy.window()
       .its('localStorage')

ui/package.json

@@ -47,8 +47,7 @@
     "eject": "react-scripts eject",
     "test:nowatch": "CI=true react-app-rewired test --env=jsdom --reporters=default --reporters=jest-junit",
     "test:integration": "cypress run --spec 'cypress/integration/**/*.spec.js'",
-    "test:e2e": "cypress run --spec 'cypress/integration/e2e/**/!(Solutions).feature'",
-    "test:e2esolutions": "cypress run --spec 'cypress/integration/e2e/Solutions.feature'",
+    "test:e2e": "cypress run --spec 'cypress/integration/e2e/**/*.feature'",
     "flow": "flow check"
   },
   "eslintConfig": {