From dbd1126fe11420e25ddddcfe596575a300951dcc Mon Sep 17 00:00:00 2001 From: minchulahn Date: Tue, 9 May 2023 13:41:30 +0900 Subject: [PATCH 1/4] cicd test --- main.py | 9 +++------ rc-version.json | 22 ++++++++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/main.py b/main.py index 7f86327..2f56271 100644 --- a/main.py +++ b/main.py @@ -8,16 +8,14 @@ def get_service_index(): def set_desired_version(): service_index = get_service_index() - json_data["service"][service_index]["desired_version"] = desired_version - print(json_data) - + json_data["service"][service_index]["desired_version"] = tagName if __name__ == '__main__': if len(sys.argv) != 3 or 'rc' not in sys.argv[1]: exit(traceback.print_exc()) - desired_version = sys.argv[1].split("rc")[1] + tagName = sys.argv[1] service_name = sys.argv[2] file_path = "./rc-version.json" @@ -27,5 +25,4 @@ if __name__ == '__main__': set_desired_version() with open(file_path, 'w') as file: - json.dump(json_data, file, indent="\t") - + json.dump(json_data, file, indent=4) diff --git a/rc-version.json b/rc-version.json index c3b6241..88f6219 100644 --- a/rc-version.json +++ b/rc-version.json @@ -1,10 +1,16 @@ { - "datasaker": "0.1.0", - "service": [ - { - "name": "sample-app", - "version": "", - "desired_version": "0.0.1" - } - ] + "service": [ + { + "type": "api", + "name": "sample-app", + "version": "rc0.0.2", + "desired_version": "rc0.0.2" + }, + { + "type": "api", + "name": "dsk-agent-api", + "version": "", + "desired_version": "" + } + ] } \ No newline at end of file From 6d2d3db28b02ae3c8c1706cf5a9a32d8865ad0a2 Mon Sep 17 00:00:00 2001 From: minchulahn Date: Tue, 9 May 2023 14:06:39 +0900 Subject: [PATCH 2/4] =?UTF-8?q?service=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-version.json | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/rc-version.json b/rc-version.json index 88f6219..520e33d 100644 --- a/rc-version.json +++ b/rc-version.json @@ -11,6 +11,150 @@ "name": "dsk-agent-api", "version": "", "desired_version": "" + }, + { + "type": "api", + "name": "dsk-agentmanager-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-alert-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-apm-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-chart-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-dashboard-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-database-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-infrastructure-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-log-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-notification-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-usergate-api", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-app-sender", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-backoffice", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-metering-batch", + "version": "", + "desired_version": "" + }, + { + "type": "api", + "name": "dsk-live-api", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-database-plan-stream", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-metric-base-agg-stream", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-metric-base-flat-stream", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-metric-jaeger-flat-stream", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-trace-stream", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-metric-custom-flat-stream", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-tagging-connector", + "version": "", + "desired_version": "" + }, + { + "type": "stream", + "name": "dsk-kafka2storage", + "version": "", + "desired_version": "" + }, + { + "type": "datagate", + "name": "dsk-datagate", + "version": "", + "desired_version": "" + }, + { + "type": "datagate", + "name": "dsk-loggate", + "version": "", + "desired_version": "" } ] } \ No newline at end of file From 65513678aac0f577111f5a50d9aa36b2c0f9b7b8 Mon Sep 17 00:00:00 2001 From: dsk-minchulahn Date: Tue, 9 May 2023 05:55:18 +0000 Subject: [PATCH 3/4] Update dsk-database-api desired version --- rc-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-version.json b/rc-version.json index 520e33d..e9c0996 100644 --- a/rc-version.json +++ b/rc-version.json @@ -46,7 +46,7 @@ "type": "api", "name": "dsk-database-api", "version": "", - "desired_version": "" + "desired_version": "rc0.0.1" }, { "type": "api", From f7e40b808f9e905bc59b13862dfda9a00fe91ce8 Mon Sep 17 00:00:00 2001 From: minchulahn Date: Tue, 9 May 2023 14:42:51 +0900 Subject: [PATCH 4/4] =?UTF-8?q?dsk-database-api=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-version.json b/rc-version.json index e9c0996..712b9d9 100644 --- a/rc-version.json +++ b/rc-version.json @@ -45,7 +45,7 @@ { "type": "api", "name": "dsk-database-api", - "version": "", + "version": "rc0.0.1", "desired_version": "rc0.0.1" }, {