Skip to content

Commit

Permalink
Fix integration CI
Browse files Browse the repository at this point in the history
  • Loading branch information
vyzigold committed Sep 6, 2023
1 parent 348c946 commit 61ac0c9
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ jobs:
if: steps.bridge_branch.outcome != 'success'
run: |
docker run --name=sgbridge --network host $BRIDGE_VOLUME -d \
$BRIDGE_IMAGE --amqp_url amqp://localhost:5666/$QDR_CHANNEL_COLLECTD \
$BRIDGE_IMAGE --amqp_url amqp://localhost:5666/$QDR_CHANNEL \
--gw_unix=$BRIDGE_SOCKET
- name: Start sg-bridge for with same branch
if: steps.bridge_branch.outcome == 'success'
run: |
docker run --name=sgbridge --network host $BRIDGE_VOLUME -d -uroot \
-e GITHUB_REF -e BRIDGE_SOCKET -e QDR_CHANNEL_COLLECTD -e OPSTOOLS_REPO \
-e GITHUB_REF -e BRIDGE_SOCKET -e QDR_CHANNEL -e OPSTOOLS_REPO \
--workdir=$(dirname $BRIDGE_SOCKET) \
$TEST_IMAGE bash $PROJECT_ROOT/ci/integration/metrics/run_bridge.sh
- name: Install collectd
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
name: "[metrics] transport: socket(sg-bridge); handler: ceilometer-metrics; application: prometheus"
runs-on: ubuntu-22.04
env:
QDR_CHANNEL: ceilometer/metering.sample
QDR_CHANNEL: /ceilometer/metering.sample
BRIDGE_SOCKET: /tmp/sg-bridge/test-socket
PROMETHEUS_IMAGE: prom/prometheus:latest
steps:
Expand Down Expand Up @@ -162,13 +162,13 @@ jobs:
if: steps.bridge_branch.outcome != 'success'
run: |
docker run --name=sgbridge --network host $BRIDGE_VOLUME -d \
$BRIDGE_IMAGE --amqp_url amqp://localhost:5666/$QDR_CHANNEL_COLLECTD \
$BRIDGE_IMAGE --amqp_url amqp://localhost:5666/$QDR_CHANNEL \
--gw_unix=$BRIDGE_SOCKET
- name: Start sg-bridge for with same branch
if: steps.bridge_branch.outcome == 'success'
run: |
docker run --name=sgbridge --network host $BRIDGE_VOLUME -d -uroot \
-e GITHUB_REF -e BRIDGE_SOCKET -e QDR_CHANNEL_COLLECTD -e OPSTOOLS_REPO \
-e GITHUB_REF -e BRIDGE_SOCKET -e QDR_CHANNEL -e OPSTOOLS_REPO \
--workdir=$(dirname $BRIDGE_SOCKET) \
$TEST_IMAGE bash $PROJECT_ROOT/ci/integration/metrics/run_bridge.sh
- name: Set Ceilometer pipelines to QDR output and restart notification agent
Expand Down Expand Up @@ -270,9 +270,6 @@ jobs:
- name: Debug output
run: |
sleep 360
echo "=========================== qdr =========================" && \
docker exec qdr qdstat -b 127.0.0.1:5666 -a
docker logs qdr
echo "========================= sg-core =======================" && \
docker logs sgcore
echo "========================= ceilometer ====================" && \
Expand Down
2 changes: 1 addition & 1 deletion ci/integration/metrics/ceilometer/bridge/run_sg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ go1.19 download
mkdir -p /usr/lib64/sg-core
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.19 BUILD_ARGS=-buildvcs=false ./build.sh

./sg-core -config ./ci/integration/metrics/sg_config_bridge.yaml
./sg-core -config ./ci/integration/metrics/ceilometer/bridge/sg_config.yaml
2 changes: 1 addition & 1 deletion ci/integration/metrics/ceilometer/tcp/run_sg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ go1.19 download
mkdir -p /usr/lib64/sg-core
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.19 BUILD_ARGS=-buildvcs=false ./build.sh

./sg-core -config ./ci/integration/metrics/sg_config_tcp.yaml
./sg-core -config ./ci/integration/metrics/ceilometer/tcp/sg_config.yaml
2 changes: 2 additions & 0 deletions ci/integration/metrics/ceilometer/tcp/sg_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ transports:
socketaddr: 127.0.0.1:4242
handlers:
- name: ceilometer-metrics
config:
source: tcp

applications:
- name: prometheus
Expand Down
2 changes: 1 addition & 1 deletion ci/integration/metrics/collectd/run_sg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ go1.19 download
mkdir -p /usr/lib64/sg-core
PLUGIN_DIR=/usr/lib64/sg-core/ GOCMD=go1.19 BUILD_ARGS=-buildvcs=false ./build.sh

./sg-core -config ./ci/integration/metrics/sg_config_collectd_bridge.yaml
./sg-core -config ./ci/integration/metrics/collectd/sg_config.yaml
3 changes: 1 addition & 2 deletions ci/integration/metrics/run_bridge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

set -ex

CHANNEL=$QDR_CHANNEL_CEILOMTR
CHANNEL=${CHANNEL:-$QDR_CHANNEL_COLLECTD}
CHANNEL=$QDR_CHANNEL

# enable required repo(s)
curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO
Expand Down

0 comments on commit 61ac0c9

Please sign in to comment.