Merge pull request #762 from provectus/checks/622-run-e2e-on-current-build

Checks/622 use current code build for e2e-checks

.github/workflows/e2e-checks.yaml

@@ -20,26 +20,30 @@ jobs:
             ${{ runner.os }}-maven-
       - uses: actions/checkout@v2
       - name: Set the values
-        id: step_one
+        id: set_env_values
         run: |
           cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env"
       - name: pull docker
-        id: step_four
+        id: pull_selenoid
         run: |
           docker pull selenoid/vnc:chrome_86.0
-      - name: compose app
-        id: step_five
-        run: |
-          docker-compose -f ./docker/kafka-ui.yaml up -d
       - name: Set up JDK 1.13
         uses: actions/setup-java@v1
         with:
           java-version: 1.13
-      - name: Build and analyze
+      - name: Build with Maven
+        id: build_app
+        run: |
+          mvn clean package -DskipTests ${{ github.event.inputs.extraMavenOptions }}
+      - name: compose app
+        id: compose_app
+        run: |
+          docker-compose -f ./docker/kafka-ui.yaml up -d
+      - name: e2e run
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+        run: mvn -pl '!kafka-ui-api' test -Pprod
       - name: Generate allure report
         uses: simple-elf/allure-report-action@master
         if: always()

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/extensions/WaitUtils.java

@@ -25,7 +25,7 @@ public class WaitUtils {
             refresh();
             i++;
             sleep(2000);
-        } while (!selectedValue.equals(element.getSelectedValue()) && i != 30);
+        } while (!selectedValue.equals(element.getSelectedValue()) && i != 40);
         Assertions.assertEquals(selectedValue, element.getSelectedValue()) ;
     }
 }

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/topics/TopicTests.java

@@ -57,6 +57,7 @@ public class TopicTests extends BaseTest {
         pages.openTopicsList(SECOND_LOCAL)
                 .isOnPage()
                 .openTopic(TOPIC_TO_UPDATE);
+        Selenide.refresh();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
                 .openEditSettings()
                 .changeCleanupPolicy(COMPACT_POLICY_VALUE)
@@ -85,6 +86,7 @@ public class TopicTests extends BaseTest {
                 .openTopic(TOPIC_TO_DELETE);
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_DELETE).clickDeleteTopicButton();
         pages.openTopicsList(SECOND_LOCAL).isNotVisible(TOPIC_TO_DELETE);
+        
     }
 
 }