Skip to content

Commit 026d3ad

Browse files
committed
Fix integration CI
This disables the logging job. Logging wasn't ever actually used. We can reenable the job if we ever decide it's useful in the future. This also adds some more debug output to other jobs.
1 parent 0ed124d commit 026d3ad

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

.github/workflows/integration.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ jobs:
102102
docker logs qdr
103103
echo "========================= sg-core =======================" && \
104104
docker logs sgcore
105+
echo "========================= sg-bridge =======================" && \
106+
docker logs sgbridge
105107
echo "======================== prometheus =====================" && \
106108
docker logs prometheus
107109
- name: Validate metrics processing
@@ -200,6 +202,8 @@ jobs:
200202
docker logs qdr
201203
echo "========================= sg-core =======================" && \
202204
docker logs sgcore
205+
echo "========================= sg-bridge =======================" && \
206+
docker logs sgbridge
203207
echo "========================= ceilometer ====================" && \
204208
sudo journalctl -xu devstack@ceilometer-anotification.service
205209
echo "======================== prometheus =====================" && \
@@ -283,6 +287,10 @@ jobs:
283287
$TEST_IMAGE bash $PROJECT_ROOT/ci/integration/metrics/ceilometer/run_validation.sh
284288
#-------------------------------------------------------------------------------
285289
logging:
290+
# Disable Logging CI job, because it's failing. This functionality was never
291+
# used in the downstream product. We can re-enable and fix the job if we
292+
# determine the functionality is useful.
293+
if: false
286294
name: "[logging] handler: logs; application: elasticsearch, loki"
287295
runs-on: ubuntu-22.04
288296
env:

.github/workflows/tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
golangci:
2020
name: Linting
2121
runs-on: ubuntu-20.04
22-
container: 'quay.io/plmr/sg-core-ci'
2322
steps:
2423
- uses: actions/setup-go@v5
2524
with:

ci/integration/logging/run_bridge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ git checkout $BRANCH || true
1818
make
1919

2020
touch $BRIDGE_SOCKET
21-
./bridge --amqp_url amqp://localhost:5666/rsyslog/logs --gw_unix=$BRIDGE_SOCKET
21+
./bridge --amqp_url amqp://localhost:5666/rsyslog/logs --gw_unix=$BRIDGE_SOCKET --stat_period 1

ci/integration/metrics/run_bridge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ git checkout $BRANCH || true
2020
make
2121

2222
touch $BRIDGE_SOCKET
23-
./bridge --amqp_url amqp://localhost:5666/$CHANNEL --gw_unix=$BRIDGE_SOCKET
23+
./bridge --amqp_url amqp://localhost:5666/$CHANNEL --gw_unix=$BRIDGE_SOCKET --stat_period 1

0 commit comments

Comments
 (0)