diff --git a/bin/initAndIngest.sh b/bin/initAndIngest.sh index 564895b6819..63cabad7408 100755 --- a/bin/initAndIngest.sh +++ b/bin/initAndIngest.sh @@ -21,4 +21,6 @@ mvn -DskipTests clean package echo "Docker compose up" cd docker/local-metadata/ docker-compose up -d --build +echo "docker build done" +echo "waiting for data ingestion" while ! wget -O /dev/null -o /dev/null localhost:8585/api/v1/teams/name/Finance; do sleep 5; done \ No newline at end of file diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java index 4038ab13c68..b7eb550ec72 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/dashboardDetails/DashboardDetailsPageTest.java @@ -47,16 +47,17 @@ public class DashboardDetailsPageTest { static Actions actions; static WebDriverWait wait; - @BeforeEach - public void openMetadataWindow() { - System.setProperty("webdriver.chrome.driver", "src/test/resources/drivers/linux/chromedriver"); - ChromeOptions options = new ChromeOptions(); - options.addArguments("--headless"); - webDriver = new ChromeDriver(options); - actions = new Actions(webDriver); - wait = new WebDriverWait(webDriver, Duration.ofSeconds(30)); - webDriver.manage().window().maximize(); - webDriver.get(url); + @BeforeEach + public void openMetadataWindow() { + System.setProperty("webdriver.chrome.driver", "src/test/resources/drivers/linux/chromedriver"); + ChromeOptions options = new ChromeOptions(); + options.addArguments("--headless"); + options.addArguments("--window-size=1280,800"); + webDriver = new ChromeDriver(options); + actions = new Actions(webDriver); + wait = new WebDriverWait(webDriver, Duration.ofSeconds(30)); + webDriver.manage().window().maximize(); + webDriver.get(url); } @Test diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java index 1196843b5e8..e218c128812 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/tableDetails/TableDetailsPageTest.java @@ -48,16 +48,17 @@ public class TableDetailsPageTest { static Actions actions; static WebDriverWait wait; - @BeforeEach - public void openMetadataWindow() { - System.setProperty("webdriver.chrome.driver", "src/test/resources/drivers/linux/chromedriver"); - ChromeOptions options = new ChromeOptions(); - options.addArguments("--headless"); - webDriver = new ChromeDriver(options); - actions = new Actions(webDriver); - wait = new WebDriverWait(webDriver, Duration.ofSeconds(30)); - webDriver.manage().window().maximize(); - webDriver.get(url); + @BeforeEach + public void openMetadataWindow() { + System.setProperty("webdriver.chrome.driver", "src/test/resources/drivers/linux/chromedriver"); + ChromeOptions options = new ChromeOptions(); + options.addArguments("--headless"); + options.addArguments("--window-size=1280,800"); + webDriver = new ChromeDriver(options); + actions = new Actions(webDriver); + wait = new WebDriverWait(webDriver, Duration.ofSeconds(30)); + webDriver.manage().window().maximize(); + webDriver.get(url); } @Test diff --git a/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java b/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java index 83c2d09639b..348792bc925 100644 --- a/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java +++ b/catalog-rest-service/src/test/java/org/openmetadata/catalog/selenium/pages/teams/TeamsPageTest.java @@ -85,19 +85,19 @@ public class TeamsPageTest { Events.click(webDriver, By.cssSelector("[data-testid='saveButton']")); } -// @Test -// @Order(3) -// public void addUser() throws InterruptedException { -// openTeamsPage(); -// Events.click(webDriver, By.xpath("//*[text()[contains(.,'"+ teamDisplayName +"')]] ")); -// // Select the created listed team -// for(int i = 0; i <=10; i++) { -// Events.click(webDriver, By.cssSelector("[data-testid='add-new-user-button']")); // select add user button -// Events.click(webDriver, By.cssSelector("[data-testid='checkboxAddUser']")); -// Events.click(webDriver, By.cssSelector("[data-testid='AddUserSave']")); -// Thread.sleep(waitTime); -// } -// } + @Test + @Order(3) + public void addUser() throws InterruptedException { + openTeamsPage(); + Events.click(webDriver, By.xpath("//*[text()[contains(.,'" + teamDisplayName + "')]] ")); + // Select the created listed team + for (int i = 0; i <= 10; i++) { + Events.click(webDriver, By.cssSelector("[data-testid='add-new-user-button']")); // select add user button + Events.click(webDriver, By.cssSelector("[data-testid='checkboxAddUser']")); + Events.click(webDriver, By.cssSelector("[data-testid='AddUserSave']")); + Thread.sleep(waitTime); + } + } @Test @Order(4) diff --git a/ingestion/examples/airflow/dags/airflow_metadata_to_es.py b/ingestion/examples/airflow/dags/airflow_metadata_to_es.py index d5300c3ce81..ee9ca4923bf 100644 --- a/ingestion/examples/airflow/dags/airflow_metadata_to_es.py +++ b/ingestion/examples/airflow/dags/airflow_metadata_to_es.py @@ -33,6 +33,7 @@ default_args = { "retries": 3, "retry_delay": timedelta(minutes=2), "execution_timeout": timedelta(minutes=60), + "schedule_interval": "*/5 * * * *", } config = """ diff --git a/ingestion/examples/airflow/dags/airflow_sample_usage.py b/ingestion/examples/airflow/dags/airflow_sample_usage.py index 3427e183566..f0aa8b33e40 100644 --- a/ingestion/examples/airflow/dags/airflow_sample_usage.py +++ b/ingestion/examples/airflow/dags/airflow_sample_usage.py @@ -33,7 +33,7 @@ default_args = { "email": ["username@org.com"], "email_on_failure": False, "retries": 3, - "retry_delay": timedelta(minutes=5), + "retry_delay": timedelta(seconds=10), "execution_timeout": timedelta(minutes=60), } diff --git a/ingestion/ingestion_dependency.sh b/ingestion/ingestion_dependency.sh index 46af5c3d850..c77debb0924 100755 --- a/ingestion/ingestion_dependency.sh +++ b/ingestion/ingestion_dependency.sh @@ -25,5 +25,7 @@ airflow users create \ --email spiderman@superhero.org \ --password admin airflow db upgrade -(sleep 10; curl -u admin:admin --data '{"dag_run_id":"index_metadata"}' -H "Content-type: application/json" -X POST http://localhost:8080/api/v1/dags/index_metadata/dagRuns) & +(while ! wget -O /dev/null -o /dev/null http://ingestion:8080; do sleep 5; done; sleep 5; curl -u admin:admin --data '{"dag_run_id":"sample_data_1"}' -H "Content-type: application/json" -X POST http://ingestion:8080/api/v1/dags/sample_data/dagRuns) & +(while ! wget -O /dev/null -o /dev/null http://ingestion:8080; do sleep 5; done; sleep 6; curl -u admin:admin --data '{"dag_run_id":"sample_usage_1"}' -H "Content-type: application/json" -X POST http://ingestion:8080/api/v1/dags/sample_usage/dagRuns) & +(while ! wget -O /dev/null -o /dev/null http://ingestion:8080; do sleep 5; done; sleep 7; curl -u admin:admin --data '{"dag_run_id":"index_metadata_1"}' -H "Content-type: application/json" -X POST http://ingestion:8080/api/v1/dags/index_metadata/dagRuns) & airflow standalone \ No newline at end of file