diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-01 15:30:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 15:30:06 +0100 |
| commit | e3f0b7db7508f1e1ecfdb23adb53531c89a29b99 (patch) | |
| tree | c14bd42ae7fe6fd90679455efe932bd37d1f7a24 /contrib/cirrus | |
| parent | 1316b2927be632ff717d9f7fd6a1633198c1ccaf (diff) | |
| parent | f62a356515e387b0bbcf1f08b4831d139c2039b7 (diff) | |
| download | podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.gz podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.tar.bz2 podman-e3f0b7db7508f1e1ecfdb23adb53531c89a29b99.zip | |
Merge pull request #8400 from rhatdan/varlink
Remove varlink support from podman
Diffstat (limited to 'contrib/cirrus')
| -rw-r--r-- | contrib/cirrus/lib.sh | 4 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 04e8a3c1c..01e75d9a6 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -71,8 +71,8 @@ SCRIPT_BASE=${SCRIPT_BASE:-./contrib/cirrus} # Downloaded, but not installed packages. PACKAGE_DOWNLOAD_DIR=/var/cache/download -# Log remote-client system test varlink output here -PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/varlink.log +# Log remote-client system test server output here +PODMAN_SERVER_LOG=$CIRRUS_WORKING_DIR/server.log # Defaults when not running under CI export CI="${CI:-false}" diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index bf2b1a52b..fa921f3e4 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -176,14 +176,6 @@ function _run_altbuild() { *Without*) make build-no-cgo ;; - *varlink-API) - export SUGGESTION='remove API.md, then "make varlink_api_generate" and commit changes.' - make varlink_api_generate BUILDTAGS="varlink" - ./hack/tree_status.sh - ;; - *varlink-binaries) - make clean BUILDTAGS="varlink" binaries - ;; *RPM*) make -f ./.copr/Makefile rpmbuild --rebuild ./podman-*.src.rpm |