ci: github: remove conflicting buildah from virtual env

buildah 1.19.4 install from the external repository adds a dependency to containers-common that comes with files that conflicts with the virtual env installation. remove the virtual env installation before proceeding with buildah install. Signed-off-by: Mikko Ylinen <[email protected]>
mythi · Feb 16, 2021 · d1844b0 · d1844b0
1 parent 18b887b
commit d1844b0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,6 @@ on:
       - 'release-*'
 env:
   RUNC_VERSION: v1.0.0-rc93
-  CRIO_VERSION: v1.20.0
   GO_VERSION: 1.15.7
 jobs:
 
@@ -103,14 +102,14 @@ jobs:
       - name: Install Buildah and RunC
         if: matrix.builder == 'buildah'
         run: |
+          sudo apt-get -qq -y purge podman containers-image buildah
           . /etc/os-release
           sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/x${ID^}_${VERSION_ID}/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
           wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/x${ID^}_${VERSION_ID}/Release.key -O Release.key
           sudo apt-key add - < Release.key
           sudo apt-get update -qq
           sudo apt-get -qq -y install buildah
           echo -e '[registries.search]\nregistries = ["docker.io"]\n\n' | sudo tee /etc/containers/registries.conf
-          sudo curl https://raw.githubusercontent.com/cri-o/cri-o/${CRIO_VERSION}/test/policy.json -o /etc/containers/policy.json
           # install runc
           sudo curl -L https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64 -o /usr/bin/runc
           sudo chmod +x /usr/bin/runc

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -49,7 +49,6 @@ pipeline {
                 '''
 		sh "sudo apt-get update -qq"
 		sh "sudo apt-get -qq -y install libusb-1.0-0-dev buildah make gcc pkg-config"
-		sh "sudo curl https://raw.githubusercontent.com/cri-o/cri-o/${CRIO_VERSION}/test/policy.json -o /etc/containers/policy.json"
 		sh "sudo curl https://raw.githubusercontent.com/cri-o/cri-o/${CRIO_VERSION}/test/registries.conf -o /etc/containers/registries.conf"
 		sh "sudo sed -i -e 's/quay/docker/' /etc/containers/registries.conf"
 		sh "sudo curl -L https://github.com/opencontainers/runc/releases/download/$RUNC_VERSION/runc.amd64 -o /usr/bin/runc"