Skip to content

Commit 9d78fdb

Browse files
committed
debug
1 parent 2b47611 commit 9d78fdb

File tree

9 files changed

+37
-36
lines changed

9 files changed

+37
-36
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# the License.
1111

1212
# This workflow will build a Java project with Maven
13-
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
14-
# Note: Any changes to this workflow would be used only after merging into develop
13+
# Fors more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
14+
# Note: Any changes to this workflow would be used only after merging into developss
1515
name: Build with unit tests
1616

1717
on:
@@ -23,7 +23,7 @@ on:
2323

2424
jobs:
2525
build:
26-
runs-on: k8s-runner-build
26+
runs-on: self-hosted
2727

2828
if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
2929

.github/workflows/e2e.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424

2525
jobs:
2626
build:
27-
runs-on: k8s-runner-e2e
27+
runs-on: self-hosted
2828
# We allow builds:
2929
# 1) When triggered manually
3030
# 2) When it's a merge into a branch
@@ -63,8 +63,9 @@ jobs:
6363
- name: Checkout e2e test repo
6464
uses: actions/checkout@v3
6565
with:
66-
repository: cdapio/cdap-e2e-tests
66+
repository: cloudsufi/cdap-e2e-tests
6767
path: e2e
68+
ref: oracle_debug
6869

6970
- name: Cache
7071
uses: actions/cache@v3
@@ -79,28 +80,28 @@ jobs:
7980
uses: 'google-github-actions/get-secretmanager-secrets@v0'
8081
with:
8182
secrets: |-
82-
ORACLE_HOST:cdapio-github-builds/ORACLE_HOST
83-
ORACLE_USERNAME:cdapio-github-builds/ORACLE_USERNAME
84-
ORACLE_PASSWORD:cdapio-github-builds/ORACLE_PASSWORD
85-
ORACLE_PORT:cdapio-github-builds/ORACLE_PORT
86-
MSSQL_HOST:cdapio-github-builds/MSSQL_HOST
87-
MSSQL_USERNAME:cdapio-github-builds/MSSQL_USERNAME
88-
MSSQL_PASSWORD:cdapio-github-builds/MSSQL_PASSWORD
89-
MSSQL_PORT:cdapio-github-builds/MSSQL_PORT
90-
MYSQL_HOST:cdapio-github-builds/MYSQL_HOST
91-
MYSQL_USERNAME:cdapio-github-builds/MYSQL_USERNAME
92-
MYSQL_PASSWORD:cdapio-github-builds/MYSQL_PASSWORD
93-
MYSQL_PORT:cdapio-github-builds/MYSQL_PORT
94-
POSTGRESQL_HOST:cdapio-github-builds/POSTGRESQL_HOST
95-
POSTGRESQL_USERNAME:cdapio-github-builds/POSTGRESQL_USERNAME
96-
POSTGRESQL_PASSWORD:cdapio-github-builds/POSTGRESQL_PASSWORD
97-
POSTGRESQL_PORT:cdapio-github-builds/POSTGRESQL_PORT
98-
CLOUDSQL_POSTGRESQL_USERNAME:cdapio-github-builds/CLOUDSQL_POSTGRESQL_USERNAME
99-
CLOUDSQL_POSTGRESQL_PASSWORD:cdapio-github-builds/CLOUDSQL_POSTGRESQL_PASSWORD
100-
CLOUDSQL_POSTGRESQL_CONNECTION_NAME:cdapio-github-builds/CLOUDSQL_POSTGRESQL_CONNECTION_NAME
101-
CLOUDSQL_MYSQL_USERNAME:cdapio-github-builds/CLOUDSQL_MYSQL_USERNAME
102-
CLOUDSQL_MYSQL_PASSWORD:cdapio-github-builds/CLOUDSQL_MYSQL_PASSWORD
103-
CLOUDSQL_MYSQL_CONNECTION_NAME:cdapio-github-builds/CLOUDSQL_MYSQL_CONNECTION_NAME
83+
ORACLE_HOST:cdf-entcon/ORACLE_HOST
84+
ORACLE_USERNAME:cdf-entcon/ORACLE_USERNAME
85+
ORACLE_PASSWORD:cdf-entcon/ORACLE_PASSWORD
86+
ORACLE_PORT:cdf-entcon/ORACLE_PORT
87+
MSSQL_HOST:cdf-entcon/MSSQL_HOST
88+
MSSQL_USERNAME:cdf-entcon/MSSQL_USERNAME
89+
MSSQL_PASSWORD:cdf-entcon/MSSQL_PASSWORD
90+
MSSQL_PORT:cdf-entcon/MSSQL_PORT
91+
MYSQL_HOST:cdf-entcon/MYSQL_HOST
92+
MYSQL_USERNAME:cdf-entcon/MYSQL_USERNAME
93+
MYSQL_PASSWORD:cdf-entcon/MYSQL_PASSWORD
94+
MYSQL_PORT:cdf-entcon/MYSQL_PORT
95+
POSTGRESQL_HOST:cdf-entcon/POSTGRESQL_HOST
96+
POSTGRESQL_USERNAME:cdf-entcon/POSTGRESQL_USERNAME
97+
POSTGRESQL_PASSWORD:cdf-entcon/POSTGRESQL_PASSWORD
98+
POSTGRESQL_PORT:cdf-entcon/POSTGRESQL_PORT
99+
CLOUDSQL_POSTGRESQL_USERNAME:cdf-entcon/CLOUDSQL_POSTGRESQL_USERNAME
100+
CLOUDSQL_POSTGRESQL_PASSWORD:cdf-entcon/CLOUDSQL_POSTGRESQL_PASSWORD
101+
CLOUDSQL_POSTGRESQL_CONNECTION_NAME:cdf-entcon/CLOUDSQL_POSTGRESQL_CONNECTION_NAME
102+
CLOUDSQL_MYSQL_USERNAME:cdf-entcon/CLOUDSQL_MYSQL_USERNAME
103+
CLOUDSQL_MYSQL_PASSWORD:cdf-entcon/CLOUDSQL_MYSQL_PASSWORD
104+
CLOUDSQL_MYSQL_CONNECTION_NAME:cdf-entcon/CLOUDSQL_MYSQL_CONNECTION_NAME
104105
105106
- name: Run required e2e tests
106107
if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' && steps.filter.outputs.e2e-test == 'false'

.github/workflows/trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626

2727
jobs:
2828
trigger:
29-
runs-on: ubuntu-latest
29+
runs-on: self-hosted
3030

3131
# We allow builds:
3232
# 1) When triggered manually

cloudsql-mysql-plugin/src/e2e-test/resources/pluginParameters.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fetchSize=1000
1717
NumSplits=1
1818
SplitBy=ID
1919
jdbcURL=jdbc:mysql:///%s?cloudSqlInstance=%s&socketFactory=com.google.cloud.sql.mysql.SocketFactory&user=%s&password=%s
20-
projectId=cdf-athena
20+
projectId=cdf-entcon
2121
datasetprojectId=cdf-athena
2222
BQReferenceName=reference
2323
targetTable=mytable5

cloudsql-postgresql-plugin/src/e2e-test/resources/pluginParameters.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ splitByColumn=ID
7979
importQuery=where $CONDITIONS
8080

8181
#bq properties
82-
projectId=cdf-athena
82+
projectId=cdf-entcon
8383
dataset=test_automation
8484
bqOutputMultipleDatatypesSchema=[{"key":"col1","value":"bytes"},{"key":"col2","value":"string"},\
8585
{"key":"col3","value":"date"},{"key":"col4","value":"double"},{"key":"col5","value":"decimal"},\

mssql-plugin/src/e2e-test/resources/pluginParameters.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ zeroValue=0
2222
blankvalue=
2323
invalidTableName=Table123@
2424
bqtarget.table=target-table
25-
projectId=cdf-athena
26-
datasetprojectId=cdf-athena
25+
projectId=cdf-entcon
26+
datasetprojectId=cdf-entcon
2727
dataset=SQL_SERVER_TEST
2828
invalid.boundQuery=SELECT MIN(id),MAX(id) FROM table
2929
splitby=id

mysql-plugin/src/e2e-test/resources/pluginParameters.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ invalid.tablename=123#
1414
invalid.referenceName=abc#
1515
fetchsize=1000
1616
no.of.splits=1
17-
projectId=cdf-athena
17+
projectId=cdf-entcon
1818
#invalid properties
1919
invalid.host=localhost1
2020
bqTargetTable=target-table
2121
bqSourceTable=dummy
22-
datasetprojectId=cdf-athena
22+
datasetprojectId=cdf-entcon
2323
dataset=test_automation
2424
table.name=mysqltable
2525
importQuery=select * from testTable where $CONDITIONS;

oracle-plugin/src/e2e-test/resources/pluginParameters.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ splitByColumn=ID
9595
importQuery=where $CONDITIONS
9696

9797
#bq properties
98-
projectId=cdf-athena
98+
projectId=cdf-entcon
9999
dataset=test_automation
100100
bqOutputDatatypesSchema=[{"key":"ID","value":"decimal"},{"key":"LASTNAME","value":"string"}]
101101
jdbcUrl=jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;ProjectId=%s;OAuthType=3;

postgresql-plugin/src/e2e-test/resources/pluginParameters.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ zeroValue=0
7979
splitByColumn=ID
8080
importQuery=where $CONDITIONS
8181
#bq properties
82-
projectId=cdf-athena
82+
projectId=cdf-entcon
8383
dataset=test_automation
8484
bqOutputMultipleDatatypesSchema=[{"key":"col1","value":"bytes"},{"key":"col2","value":"string"},\
8585
{"key":"col3","value":"date"},{"key":"col4","value":"double"},{"key":"col5","value":"decimal"},\

0 commit comments

Comments
 (0)