Merge pull request #137 from infrawatch/jwysogla-test-ci

Fix sg-bridge in integration CI
infrawatch · Jun 17, 2024 · 1e641f9 · 1e641f9
2 parents ad9f37b + 92c34b8
commit 1e641f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -75,7 +75,7 @@ jobs:
         run: |
           docker run --name=sgbridge --network host $BRIDGE_VOLUME -d -uroot \
             -e GITHUB_REF -e BRIDGE_SOCKET -e QDR_CHANNEL -e OPSTOOLS_REPO \
-            --workdir=$(dirname $BRIDGE_SOCKET) \
+            --workdir=$(dirname $BRIDGE_SOCKET) --volume ${{ github.workspace }}:$PROJECT_ROOT:z \
             $TEST_IMAGE bash $PROJECT_ROOT/ci/integration/metrics/run_bridge.sh
       - name: Install collectd
         run: |
@@ -171,7 +171,7 @@ jobs:
         run: |
           docker run --name=sgbridge --network host $BRIDGE_VOLUME -d -uroot \
             -e GITHUB_REF -e BRIDGE_SOCKET -e QDR_CHANNEL -e OPSTOOLS_REPO \
-            --workdir=$(dirname $BRIDGE_SOCKET) \
+            --workdir=$(dirname $BRIDGE_SOCKET) --volume ${{ github.workspace }}:$PROJECT_ROOT:z \
             $TEST_IMAGE bash $PROJECT_ROOT/ci/integration/metrics/run_bridge.sh
       - name: Set Ceilometer pipelines to QDR output and restart notification agent
         run: |
@@ -334,7 +334,7 @@ jobs:
         if: steps.bridge_branch.outcome == 'success'
         run: |
           docker run --name=sgbridge $BRIDGE_VOLUME -d -uroot --network host -e OPSTOOLS_REPO \
-            -e GITHUB_REF -e BRIDGE_SOCKET --workdir=$(dirname $BRIDGE_SOCKET) \
+            -e GITHUB_REF -e BRIDGE_SOCKET --workdir=$(dirname $BRIDGE_SOCKET) --volume ${{ github.workspace }}:$PROJECT_ROOT:z \
             $TEST_IMAGE bash $PROJECT_ROOT/ci/integration/logging/run_bridge.sh
       - name: Run rsyslog to produce log messages
         run: |

diff --git a/ci/integration/logging/run_bridge.sh b/ci/integration/logging/run_bridge.sh
@@ -8,7 +8,7 @@ set -ex
 curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO
 sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-OpsTools.repo
 
-dnf install -y git gcc make qpid-proton-c-devel
+dnf install -y git gcc make qpid-proton-c-devel redhat-rpm-config
 
 # install and start sg-bridge
 BRANCH="$(echo ${GITHUB_REF#refs/heads/})"

diff --git a/ci/integration/metrics/run_bridge.sh b/ci/integration/metrics/run_bridge.sh
@@ -10,7 +10,7 @@ CHANNEL=$QDR_CHANNEL
 curl -o /etc/yum.repos.d/CentOS-OpsTools.repo $OPSTOOLS_REPO
 sed -i 's/gpgcheck=1/gpgcheck=0/g' /etc/yum.repos.d/CentOS-OpsTools.repo
 
-dnf install -y git gcc make qpid-proton-c-devel
+dnf install -y git gcc make qpid-proton-c-devel redhat-rpm-config
 
 # install and start sg-bridge
 BRANCH="$(echo ${GITHUB_REF#refs/heads/})"