Skip to content

Commit 6107d30

Browse files
committed
Merge branch 'logging-testing' into 'main'
Logging testing See merge request flarenetwork/flare-system-c-chain-indexer!51
2 parents 5ca783e + 6c9e5ec commit 6107d30

25 files changed

+370
-249
lines changed

.env.example

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

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
logger/logs
22
tmp/
33
*.log
4-
config.*.toml
4+
config.toml
5+
.vscode/
6+
coverage.out
7+

.gitlab-ci.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
22
GOPATH: /go
33
MYSQL_ROOT_PASSWORD: root
4-
MYSQL_DATABASE: flare_ftso_indexer_test
4+
MYSQL_DATABASE: flare_ftso_indexer_indexer_test
55
GOLANG_VERSION: "1.21.12"
66
GOLINT_VERSION: "v1.59.1"
77

@@ -48,26 +48,28 @@ test:
4848
DB_PASSWORD: ${MYSQL_ROOT_PASSWORD}
4949
MOCK_CHAIN_PORT: 2426
5050
services:
51-
- mysql:latest
51+
- name: mysql:latest
52+
alias: mysql
5253
script:
54+
- sed -i 's/test_host = "localhost"/test_host = "mysql"/' testing/config_test.toml
5355
- go test ./indexer
5456

5557
build-container:
5658
stage: build
5759
needs: []
5860
image: gcr.si/cts/build-oci:1.3.0@sha256:af8fd5a7f8bf74037741f8a831209d66078d94251dd155df6d61b61a9f922bf7
59-
script: [ "/build.sh" ]
61+
script: ["/build.sh"]
6062
variables:
6163
CTS_BUILD_CACHE_REPO: ${CI_REGISTRY_IMAGE}/cache
6264
CTS_BUILD_DOCKERFILE: Dockerfile
6365
rules:
64-
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
65-
variables:
66-
CTS_BUILD_TAG: latest
67-
- if: $CI_COMMIT_TAG != null
68-
variables:
69-
CTS_BUILD_TAG: $CI_COMMIT_TAG
70-
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != 'merge_request_event'
66+
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
67+
variables:
68+
CTS_BUILD_TAG: latest
69+
- if: $CI_COMMIT_TAG != null
70+
variables:
71+
CTS_BUILD_TAG: $CI_COMMIT_TAG
72+
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != 'merge_request_event'
7173

72-
variables:
73-
CTS_BUILD_TAG: $CI_COMMIT_REF_SLUG
74+
variables:
75+
CTS_BUILD_TAG: $CI_COMMIT_REF_SLUG

.snapshots/TestIntegration-IndexContinuous-check_blocks renamed to .snapshots/TestIntegrationIndexContinuous-TestCheckBlocks

File renamed without changes.

.snapshots/TestIntegration-IndexContinuous-check_logs renamed to .snapshots/TestIntegrationIndexContinuous-TestCheckLogs

File renamed without changes.

.snapshots/TestIntegration-IndexContinuous-check_transactions renamed to .snapshots/TestIntegrationIndexContinuous-TestCheckTransactions

File renamed without changes.
File renamed without changes.
File renamed without changes.

.snapshots/TestIntegration-IndexHistory-check_transactions renamed to .snapshots/TestIntegrationIndexHistory-TestCheckTransactions

File renamed without changes.

.vscode/settings.json

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

0 commit comments

Comments
 (0)