Use static linking instead of dynamic

Bug: 1689926 Change-Id: I68646e7fac03f5efcdd8876c5ebcb17da038b772
beaker-project · Mar 18, 2019 · e8459cb · e8459cb
1 parent 1d0563b
commit e8459cb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/restraint-fetch-tarballs.yaml b/restraint-fetch-tarballs.yaml
@@ -5,3 +5,4 @@
             # Hack to pull tarballs from dist-git, instead of from the internet
             cd third-party
             curl -fsS 'http://pkgs.devel.redhat.com/cgit/rpms/restraint/plain/sources?h=eng-rhel-6' | while read hash filename ; do curl -fsSLO http://pkgs.devel.redhat.com/repo/pkgs/restraint/$filename/$hash/$filename ; done
+            make
diff --git a/restraint-review-checks-unittests.yaml b/restraint-review-checks-unittests.yaml
@@ -17,7 +17,8 @@
             : ${XDG_RUNTIME_DIR:=/run/user/$(id -u)}
             unset http_proxy
             set -o pipefail
-            flock $XDG_RUNTIME_DIR/restraint-tests-flock make check 2>&1 | tee check.out
+            export PKG_CONFIG_PATH=../third-party/tree/lib/pkgconfig
+            flock $XDG_RUNTIME_DIR/restraint-tests-flock make check STATIC=1 2>&1 | tee check.out
     publishers:
         - archive:
             artifacts: check.out

diff --git a/restraint-review-checks-valgrind.yaml b/restraint-review-checks-valgrind.yaml
@@ -17,7 +17,8 @@
             : ${XDG_RUNTIME_DIR:=/run/user/$(id -u)}
             unset http_proxy
             set -o pipefail
-            flock $XDG_RUNTIME_DIR/restraint-tests-flock make -C src valgrind 2>&1 | tee valgrind.out
+            export PKG_CONFIG_PATH=../third-party/tree/lib/pkgconfig
+            flock $XDG_RUNTIME_DIR/restraint-tests-flock make STATIC=1 -C src valgrind 2>&1 | tee valgrind.out
     publishers:
         - archive:
             artifacts: valgrind.out

diff --git a/restraint-unittests.yaml b/restraint-unittests.yaml
@@ -22,6 +22,7 @@
         - shell: |
             : ${XDG_RUNTIME_DIR:=/run/user/$(id -u)}
             unset http_proxy
-            flock $XDG_RUNTIME_DIR/restraint-tests-flock make check
+            export PKG_CONFIG_PATH=../third-party/tree/lib/pkgconfig
+            flock $XDG_RUNTIME_DIR/restraint-tests-flock make check STATIC=1
     publishers:
         - report-failures
diff --git a/restraint-valgrind.yaml b/restraint-valgrind.yaml
@@ -22,6 +22,7 @@
         - shell: |
             : ${XDG_RUNTIME_DIR:=/run/user/$(id -u)}
             unset http_proxy
-            flock $XDG_RUNTIME_DIR/restraint-tests-flock make -C src valgrind
+            export PKG_CONFIG_PATH=../third-party/tree/lib/pkgconfig
+            flock $XDG_RUNTIME_DIR/restraint-tests-flock make STATIC=1 -C src valgrind
     publishers:
         - report-failures