Skip to content
This repository was archived by the owner on Apr 23, 2025. It is now read-only.

test: disable service tests #933

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --continue --no-daemon
run: ./gradlew build --continue
- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Play integration tests
run: ./gradlew integrationTest --continue --no-daemon
run: ./gradlew integrationTest --continue
- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down
19 changes: 3 additions & 16 deletions .github/workflows/cluster_integration_ui_tests.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Cluster Integration UI Tests
name: Integration UI Tests with Local Kind Cluster Context
on:
workflow_run:
workflows: [ "Java CI with Gradle" ]
types:
- completed
jobs:
kubernetes-integration-ui-tests:
cluster-integration-ui-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -23,19 +23,6 @@ jobs:
validate-wrappers: true
- uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde #v1.10.0
name: Start cluster
- name: Setup cluster
run: |
curl -sL https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.26.0/install.sh | bash -s v0.26.0
kubectl create -f https://operatorhub.io/install/service-binding-operator.yaml
kubectl create -f https://operatorhub.io/install/stable/cloud-native-postgresql.yaml
nb=0
echo -n "Waiting for operator to show up "
while [ "$nb" != "2" ]
do
echo -n "."
sleep 1
nb=`kubectl get pods -n operators --no-headers --ignore-not-found | grep Running | wc -l`
done
- name: Grant execute permission for gradlew
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do I get it right that these creates are not needed any more because you disabled the service tests?
Wouldn't it be preferrable to comment these since the tests also still exist but are disabled?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah iagree to comment out because the test is disabled and not removed.

run: chmod +x gradlew
- name: Play cluster integration UI tests
Expand All @@ -47,7 +34,7 @@ jobs:
export DISPLAY=:99.0
Xvfb -ac :99 -screen 0 1920x1080x16 &
sleep 10
./gradlew clusterIntegrationUITest --continue --no-daemon --info
./gradlew clusterIntegrationUITest --continue
- name: Publish tests reports
if: always()
uses: scacap/action-surefire-report@a2911bd1a4412ec18dde2d93b1758b3e56d2a880 #v1.8.0
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/public_integration_ui_tests.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Public Integration UI Tests
name: Integration UI Tests with No Context
on:
workflow_run:
workflows: [ "Java CI with Gradle" ]
types:
- completed
jobs:
public-integration-ui-tests:
no-context-integration-ui-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -23,23 +23,23 @@ jobs:
validate-wrappers: true
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Play public integration UI tests
- name: Play integration UI tests
env:
GPG_PASSPHRASE: ${{ secrets.IDEA_KEY_PASSPHRASE }}
run: |
echo -n "$GPG_PASSPHRASE" | gpg --decrypt --passphrase-fd 0 --pinentry-mode loopback --output idea_license_token/idea.key idea_license_token/idea.key.gpg
export DISPLAY=:99.0
Xvfb -ac :99 -screen 0 1920x1080x16 &
sleep 10
./gradlew publicIntegrationUITest --continue --no-daemon
./gradlew publicIntegrationUITest --continue
- name: Publish tests reports
Copy link
Contributor

@adietish adietish Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be preferrable to rename the gradle task since we renamed the github task?
Something like:

./gradlew noContextIntegrationUITest --continue

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this PR does still use old gradle build, so still using the old naming

if: always()
uses: scacap/action-surefire-report@a2911bd1a4412ec18dde2d93b1758b3e56d2a880 #v1.8.0
with:
github_token: ${{secrets.GITHUB_TOKEN}}
report_paths: '${{github.workspace}}/build/test-results/**/TEST-*.xml'
commit: ${{github.event.workflow_run.head_sha}}
check_name: Public Integration UI Tests Report
check_name: Integration UI Tests with No Context Report
- name: Publish screenshots as artifacts
if: failure()
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ dependencies {
'org.awaitility:awaitility:4.2.2',
'org.mock-server:mockserver-client-java:5.15.0',
'org.mock-server:mockserver-netty:5.15.0',
'com.redhat.devtools.intellij:intellij-common-ui-test-library:0.4.1',
'com.redhat.devtools.intellij:intellij-common-ui-test-library:0.4.3-SNAPSHOT',
'org.junit.jupiter:junit-jupiter-engine:5.10.3',
'org.junit.jupiter:junit-jupiter-api:5.10.3',
'org.junit.jupiter:junit-jupiter:5.10.3',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
package org.jboss.tools.intellij.openshift.test.ui;

import com.intellij.remoterobot.RemoteRobot;
import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.ToolWindowPane;
import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
import com.redhat.devtools.intellij.commonuitest.utils.screenshot.ScreenshotUtils;
import org.jboss.tools.intellij.openshift.test.ui.annotations.UITest;
Expand All @@ -37,7 +35,6 @@
import java.io.File;
import java.time.Duration;


/**
* @author Ondrej Dockal, [email protected]
*/
Expand Down Expand Up @@ -110,20 +107,6 @@ protected static void logOut() {
}
}

public RemoteRobot getRobotReference() {
return robot;
}

public boolean isStripeButtonAvailable(String label) {
try {
ToolWindowPane toolWindowPane = robot.find(ToolWindowPane.class);
toolWindowPane.stripeButton(label, false);
} catch (WaitForConditionTimeoutException e) {
return false;
}
return true;
}

protected static void sleep(long ms) {
LOGGER.info("Putting thread into sleep for: {} ms", ms);
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
/*******************************************************************************
* Copyright (c) 2024 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v2.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v20.html
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.intellij.openshift.test.ui;

import org.jboss.tools.intellij.openshift.test.ui.tests_cluster.*;
import org.jboss.tools.intellij.openshift.test.ui.tests_cluster.AboutClusterTest;
import org.jboss.tools.intellij.openshift.test.ui.tests_cluster.CreateComponentTest;
import org.jboss.tools.intellij.openshift.test.ui.tests_cluster.CreateServiceTest;
import org.jboss.tools.intellij.openshift.test.ui.tests_cluster.LoginClusterTest;
import org.jboss.tools.intellij.openshift.test.ui.tests_cluster.ProjectClusterTest;
import org.jboss.tools.intellij.openshift.test.ui.utils.KubeConfigUtility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
/*******************************************************************************
* Copyright (c) 2024 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v2.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v20.html
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
package org.jboss.tools.intellij.openshift.test.ui;
import org.jboss.tools.intellij.openshift.test.ui.tests_public.*;

import org.jboss.tools.intellij.openshift.test.ui.tests_public.AboutPublicTest;
import org.jboss.tools.intellij.openshift.test.ui.tests_public.ClusterLoginDialogPublicTest;
import org.jboss.tools.intellij.openshift.test.ui.tests_public.GettingStartedTest;
import org.jboss.tools.intellij.openshift.test.ui.tests_public.OpenshiftExtensionTest;
import org.jboss.tools.intellij.openshift.test.ui.utils.KubeConfigUtility;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading