Skip to content

Commit 16a48e3

Browse files
nuclearcatJenySadadia
authored andcommitted
send_kcidb: Remove PostgreSQL references
We need to remove all PostgreSQL references as we removed google cloud infrastructure this week and code started to fail. Signed-off-by: Denys Fedoryshchenko <[email protected]>
1 parent 235e5d9 commit 16a48e3

File tree

4 files changed

+1
-99
lines changed

4 files changed

+1
-99
lines changed

config/kernelci.toml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ output = "/home/kernelci/data/output"
3737
[notifier]
3838

3939
[send_kcidb]
40-
kcidb_topic_name = "playground_kcidb_new"
41-
kcidb_project_id = "kernelci-production"
42-
database_name = "playground_kcidb"
43-
postgresql_host = "kernelci-pipeline-postgres-proxy"
44-
postgresql_port = 5432
45-
postgresql_user = "kernelci.org"
46-
# postgresql_password = "KCIDB-POSTGRESQL-USER-PASSWORD"
4740
origin = "maestro"
4841

4942
[test_report]

docker-compose-kcidb.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ services:
2525
- './data/kcidb:/home/kernelci/data/kcidb'
2626
- './logs:/home/kernelci/pipeline/logs'
2727
restart: on-failure
28-
postgres:
29-
container_name: 'kernelci-pipeline-postgres-proxy'
30-
image: 'gcr.io/cloud-sql-connectors/cloud-sql-proxy:latest'
31-
command: 'kernelci-production:us-central1:postgresql2 -c/home/kernelci/data/kcidb/kernelci-production-ci-kernelci.json -a0.0.0.0'
32-
networks: ['kcidb']
33-
volumes:
34-
- './data/kcidb:/home/kernelci/data/kcidb'
35-
restart: on-failure
3628

3729
networks:
3830
kcidb:

kube/aks/kcidb-postgres-proxy.yaml

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/send_kcidb.py

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,11 @@ def __init__(self, configs, args, name):
7272
}
7373

7474
def _setup(self, args):
75-
db_conn = (
76-
f"postgresql:dbname={args.database_name} "
77-
f"user={args.postgresql_user} host={args.postgresql_host} "
78-
f"password={args.postgresql_password} "
79-
f"port={args.postgresql_port}"
80-
)
81-
db_client = kcidb.db.Client(db_conn)
8275
return {
8376
'client': kcidb.Client(
8477
project_id=args.kcidb_project_id,
8578
topic_name=args.kcidb_topic_name
8679
),
87-
'kcidb_oo_client': kcidb.oo.Client(db_client),
8880
'sub_id': self._api_helper.subscribe_filters(self._filters, promiscuous=True),
8981
'origin': args.origin,
9082
}
@@ -892,7 +884,7 @@ def _parse_fail_node(self, parsed_node, context, node_type):
892884
local_url = f"file://{local_file}"
893885

894886
parsed_fail, new_status = generate_issues_and_incidents(
895-
parsed_node['id'], local_url, test_type, context['kcidb_oo_client'])
887+
parsed_node['id'], local_url, test_type, None)
896888

897889
if new_status:
898890
self.log.warning(
@@ -931,26 +923,6 @@ class cmd_run(Command):
931923
'name': '--origin',
932924
'help': "CI system identifier",
933925
},
934-
{
935-
'name': '--database-name',
936-
'help': "KCIDB postgresql database instance name",
937-
},
938-
{
939-
'name': '--postgresql-host',
940-
'help': "KCIDB postgresql DB host",
941-
},
942-
{
943-
'name': '--postgresql-port',
944-
'help': "KCIDB postgresql DB port",
945-
},
946-
{
947-
'name': '--postgresql-user',
948-
'help': "Username for connecting to KCIDB postgresql DB",
949-
},
950-
{
951-
'name': '--postgresql-password',
952-
'help': "Password for connecting to KCIDB postgresql DB",
953-
},
954926
]
955927

956928
def __call__(self, configs, args):

0 commit comments

Comments
 (0)