fixing loki config (#551)

smartcontractkit · Feb 22, 2024 · f1b67e0 · f1b67e0
1 parent ae5b8d0
commit f1b67e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/ccip-chaos-tests.yml b/.github/workflows/ccip-chaos-tests.yml
@@ -125,7 +125,6 @@ jobs:
           chainlinkVersion: ${{ github.sha }}
           lokiEndpoint: ${{ secrets.LOKI_URL }}
           lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
           grafanaUrl: ${{ vars.GRAFANA_URL }}
           grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
@@ -198,7 +197,6 @@ jobs:
           chainlinkVersion: ${{ github.sha }}
           lokiEndpoint: ${{ secrets.LOKI_URL }}
           lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
           grafanaUrl: ${{ vars.GRAFANA_URL }}
           grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"

diff --git a/.github/workflows/ccip-load-tests.yml b/.github/workflows/ccip-load-tests.yml
@@ -151,7 +151,6 @@ jobs:
           chainlinkVersion: ${{ github.sha }}
           lokiEndpoint: ${{ secrets.LOKI_URL }}
           lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
           grafanaUrl: ${{ vars.GRAFANA_URL }}
           grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
@@ -249,7 +248,6 @@ jobs:
           chainlinkVersion: ${{ github.sha }}
           lokiEndpoint: ${{ secrets.LOKI_URL }}
           lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
-          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
           grafanaUrl: ${{ vars.GRAFANA_URL }}
           grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -292,7 +292,7 @@ jobs:
 #          pyroscopeServer: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
 #          pyroscopeEnvironment: ${{ matrix.product.pyroscope_env }}
 #          pyroscopeKey: ${{ secrets.QA_PYROSCOPE_KEY }}
-#          lokiEndpoint: ${{ secrets.LOKI_URL }}
+#          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
 #          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
 #          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
 #          logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
@@ -378,7 +378,7 @@ jobs:
 #          pyroscopeServer: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
 #          pyroscopeEnvironment: ${{ matrix.product.pyroscope_env }}
 #          pyroscopeKey: ${{ secrets.QA_PYROSCOPE_KEY }}
-#          lokiEndpoint: ${{ secrets.LOKI_URL }}
+#          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
 #          lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
 #          lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
 #          logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
@@ -669,7 +669,7 @@ jobs:
           pyroscopeServer: ${{ matrix.product.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           pyroscopeEnvironment: ${{ matrix.product.pyroscope_env }}
           pyroscopeKey: ${{ secrets.QA_PYROSCOPE_KEY }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
+          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
           lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
@@ -683,7 +683,7 @@ jobs:
           selectedNetworks: SIMULATED_1,SIMULATED_2
           chainlinkImage: ${{ env.CHAINLINK_IMAGE }}
           chainlinkVersion: ${{ github.sha }}
-          lokiEndpoint: ${{ secrets.LOKI_URL }}
+          lokiEndpoint: ${{ secrets.LOKI_URL_CI }}
           lokiTenantId: ${{ vars.LOKI_TENANT_ID }}
           lokiBasicAuth: ${{ secrets.LOKI_BASIC_AUTH }}
           logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}

diff --git a/integration-tests/ccip-tests/testconfig/override/mainnet.toml b/integration-tests/ccip-tests/testconfig/override/mainnet.toml
@@ -684,7 +684,7 @@ NetworkPairs = [
 MsgType = 'WithoutToken'
 DestGasLimit = 0
 BiDirectionalLane = true
-PhaseTimeout = '50m'
+PhaseTimeout = '20m'
 TestDuration = '5h'
 ExistingDeployment = true
 RequestPerUnitTime = [1]
@@ -729,7 +729,7 @@ NetworkPairs = [
 ]
 BiDirectionalLane = true
 DestGasLimit = 0
-PhaseTimeout = '50m'
+PhaseTimeout = '20m'
 LocalCluster = false
 ExistingDeployment = true
 ReuseContracts = true