Skip to content

Commit 9740cc8

Browse files
priyabhatnagar25Vipinofficial11
authored andcommitted
Removed Issue tag Plugin-1669 in Runtime scenarios and test runner file,
updated correct conn string, removed space in yml, removed verify goal in pom. changed sql connector java version to run in github actions and bqmt secret updated
1 parent 3579401 commit 9740cc8

File tree

6 files changed

+10
-13
lines changed

6 files changed

+10
-13
lines changed

.github/workflows/e2e.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
MYSQL_USERNAME:cdapio-github-builds/MYSQL_USERNAME
7979
MYSQL_PASSWORD:cdapio-github-builds/MYSQL_PASSWORD
8080
MYSQL_PORT:cdapio-github-builds/MYSQL_PORT
81-
CONNECTION_STRING:cdapio-github-builds/CONNECTION_STRING
81+
BQMT_CONNECTION_STRING:cdapio-github-builds/BQMT_CONNECTION_STRING
8282
8383
- name: Run required e2e tests
8484
if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' && steps.filter.outputs.e2e-test == 'false'
@@ -88,7 +88,7 @@ jobs:
8888
MYSQL_USERNAME: ${{ steps.secrets.outputs.MYSQL_USERNAME }}
8989
MYSQL_PASSWORD: ${{ steps.secrets.outputs.MYSQL_PASSWORD }}
9090
MYSQL_PORT: ${{ steps.secrets.outputs.MYSQL_PORT }}
91-
CONNECTION_STRING: ${{ steps.secrets.outputs.CONNECTION_STRING }}
91+
BQMT_CONNECTION_STRING: ${{ steps.secrets.outputs.BQMT_CONNECTION_STRING }}
9292

9393
- name: Run all e2e tests
9494
if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || steps.filter.outputs.e2e-test == 'true'
@@ -98,7 +98,7 @@ jobs:
9898
MYSQL_USERNAME: ${{ steps.secrets.outputs.MYSQL_USERNAME }}
9999
MYSQL_PASSWORD: ${{ steps.secrets.outputs.MYSQL_PASSWORD }}
100100
MYSQL_PORT: ${{ steps.secrets.outputs.MYSQL_PORT }}
101-
CONNECTION_STRING: ${{ steps.secrets.outputs.CONNECTION_STRING }}
101+
BQMT_CONNECTION_STRING: ${{ steps.secrets.outputs.BQMT_CONNECTION_STRING }}
102102
- name: Upload debug files
103103
uses: actions/upload-artifact@v3
104104
if: always()

pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!--
43
~ Copyright © 2016-2019 Cask Data, Inc.
54
~
@@ -1201,7 +1200,6 @@
12011200
<execution>
12021201
<goals>
12031202
<goal>integration-test</goal>
1204-
<goal>verify</goal>
12051203
</goals>
12061204
</execution>
12071205
</executions>
@@ -1252,7 +1250,7 @@
12521250
<dependency>
12531251
<groupId>mysql</groupId>
12541252
<artifactId>mysql-connector-java</artifactId>
1255-
<version>8.0.19</version>
1253+
<version>8.0.25</version>
12561254
<scope>test</scope>
12571255
</dependency>
12581256
<dependency>

src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBigQueryMultiTableSink_WithMacro.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@BQMT_SINK
1616
Feature: BigQueryMultiTable sink -Verification of Multiple Database Tables to BigQueryMultiTable successful data transfer using macros
1717

18-
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
18+
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
1919
Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with all datatypes using macros
2020
Given Open Datafusion Project to configure pipeline
2121
When Expand Plugin group in the LHS plugins list: "Source"
@@ -71,7 +71,7 @@ Feature: BigQueryMultiTable sink -Verification of Multiple Database Tables to Bi
7171
Then Verify the pipeline status is "Succeeded"
7272
Then Validate the values of records transferred to BQMT sink is equal to the value from source MultiDatabase table
7373

74-
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
74+
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
7575
Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with split field using macros
7676
Given Open Datafusion Project to configure pipeline
7777
When Expand Plugin group in the LHS plugins list: "Source"

src/e2e-test/features/bigquerymultitable/MultipleDatabaseTableToBiqQueryMultiTableSink.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@BQMT_SINK
1616
Feature: BigQueryMultiTable sink -Verification of MultipleDatabaseTable to BigQueryMultiTable successful data transfer
1717

18-
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
18+
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
1919
Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with all datatypes
2020
Given Open Datafusion Project to configure pipeline
2121
When Expand Plugin group in the LHS plugins list: "Source"
@@ -58,7 +58,7 @@ Feature: BigQueryMultiTable sink -Verification of MultipleDatabaseTable to BigQu
5858
Then Verify the pipeline status is "Succeeded"
5959
Then Validate the values of records transferred to BQMT sink is equal to the value from source MultiDatabase table
6060

61-
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required @PLUGIN-1669
61+
@MULTIPLEDATABASETABLE_SOURCE_TEST @BQMT_Required
6262
Scenario:Verify data is getting transferred from Multiple Database Tables to BQMT sink with split field
6363
Given Open Datafusion Project to configure pipeline
6464
When Expand Plugin group in the LHS plugins list: "Source"

src/e2e-test/java/io/cdap/plugin/bigquerymultitable/runners/TestRunner.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
features = {"src/e2e-test/features"},
2828
glue = {"io.cdap.plugin.bigquerymultitable.stepsdesign", "io.cdap.plugin.gcs.stepsdesign", "stepsdesign",
2929
"io.cdap.plugin.common.stepsdesign"},
30-
tags = {"@BQMT_SINK and not @PLUGIN-1669"},
31-
//TODO: Enable test once issue is fixed https://cdap.atlassian.net/browse/PLUGIN-1669
30+
tags = {"@BQMT_SINK"},
3231
monochrome = true,
3332
plugin = {"pretty", "html:target/cucumber-html-report/bigquerymultitable",
3433
"json:target/cucumber-reports/cucumber-bigquerymultitable.json",

src/e2e-test/resources/pluginParameters.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ host=MYSQL_HOST
238238
user=MYSQL_USERNAME
239239
pass=MYSQL_PASSWORD
240240
port=MYSQL_PORT
241-
connectionString=CONNECTION_STRING
241+
connectionString=BQMT_CONNECTION_STRING
242242
mySQLSourceTable=dummy
243243
sourceTable=dummy
244244
tableNameField=tableName

0 commit comments

Comments
 (0)