diff options
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 6 | ||||
| -rw-r--r-- | contrib/cirrus/packer/libpod_images.yml | 4 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_packaging.sh | 32 |
4 files changed, 13 insertions, 35 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index e53788c6c..d1bced3d9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -36,10 +36,10 @@ env: ### FEDORA_NAME: "fedora-32" PRIOR_FEDORA_NAME: "fedora-31" - UBUNTU_NAME: "ubuntu-19" - PRIOR_UBUNTU_NAME: "ubuntu-18" + UBUNTU_NAME: "ubuntu-20" + PRIOR_UBUNTU_NAME: "ubuntu-19" - _BUILT_IMAGE_SUFFIX: "libpod-6224667180531712" # From the packer output of 'build_vm_images_script' + _BUILT_IMAGE_SUFFIX: "FIXME" # From the packer output of 'build_vm_images_script' FEDORA_CACHE_IMAGE_NAME: "${FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "${PRIOR_FEDORA_NAME}-${_BUILT_IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "${UBUNTU_NAME}-${_BUILT_IMAGE_SUFFIX}" diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index c0dd8cfc5..f1e542e74 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -65,9 +65,9 @@ PACKER_VER="1.4.2" # Base-images rarely change, define them here so they're out of the way. export PACKER_BUILDS="${PACKER_BUILDS:-ubuntu-18,ubuntu-19,fedora-32,fedora-31}" -# Manually produced base-image names (see $SCRIPT_BASE/README.md) -export UBUNTU_BASE_IMAGE="ubuntu-1910-eoan-v20200211" -export PRIOR_UBUNTU_BASE_IMAGE="ubuntu-1804-bionic-v20200218" +# Google cloud provides these, we just make copies (see $SCRIPT_BASE/README.md) for use +export UBUNTU_BASE_IMAGE="ubuntu-2004-focal-v20200506" +export PRIOR_UBUNTU_BASE_IMAGE="ubuntu-1910-eoan-v20200211" # Manually produced base-image names (see $SCRIPT_BASE/README.md) export FEDORA_BASE_IMAGE="fedora-cloud-base-32-1-6-1588257430" export PRIOR_FEDORA_BASE_IMAGE="fedora-cloud-base-31-1-9-1588257430" diff --git a/contrib/cirrus/packer/libpod_images.yml b/contrib/cirrus/packer/libpod_images.yml index e33ad775e..754626a2e 100644 --- a/contrib/cirrus/packer/libpod_images.yml +++ b/contrib/cirrus/packer/libpod_images.yml @@ -29,7 +29,7 @@ sensitive-variables: builders: # v----- is a YAML anchor, allows referencing this object by name (below) - &gce_hosted_image - name: 'ubuntu-19' + name: 'ubuntu-20' type: 'googlecompute' image_name: '{{build_name}}{{user `BUILT_IMAGE_SUFFIX`}}' image_family: '{{build_name}}-cache' @@ -46,7 +46,7 @@ builders: # v----- is a YAML alias, allows partial re-use of the anchor object - <<: *gce_hosted_image - name: 'ubuntu-18' + name: 'ubuntu-19' source_image: '{{user `PRIOR_UBUNTU_BASE_IMAGE`}}' source_image_family: 'prior-ubuntu-base' diff --git a/contrib/cirrus/packer/ubuntu_packaging.sh b/contrib/cirrus/packer/ubuntu_packaging.sh index b57bc95e9..d9d212494 100644 --- a/contrib/cirrus/packer/ubuntu_packaging.sh +++ b/contrib/cirrus/packer/ubuntu_packaging.sh @@ -26,12 +26,6 @@ source /usr/share/automation/environment $LILTO ooe.sh $SUDOAPTADD ppa:criu/ppa -# Install newer version of golang -if [[ "$OS_RELEASE_VER" -eq "18" ]] -then - $LILTO ooe.sh $SUDOAPTADD ppa:longsleep/golang-backports -fi - echo "Configuring/Instaling deps from Open build server" VERSION_ID=$(source /etc/os-release; echo $VERSION_ID) echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_$VERSION_ID/ /" \ @@ -45,7 +39,9 @@ INSTALL_PACKAGES=(\ autoconf automake bash-completion + bats bison + btrfs-progs build-essential buildah bzip2 @@ -60,6 +56,7 @@ INSTALL_PACKAGES=(\ e2fslibs-dev emacs-nox file + fuse3 gawk gcc gettext @@ -71,11 +68,13 @@ INSTALL_PACKAGES=(\ jq libaio-dev libapparmor-dev + libbtrfs-dev libcap-dev libdevmapper-dev libdevmapper1.02.1 libfuse-dev libfuse2 + libfuse3-dev libglib2.0-dev libgpgme11-dev liblzma-dev @@ -123,27 +122,6 @@ INSTALL_PACKAGES=(\ zlib1g-dev ) -if [[ $OS_RELEASE_VER -ge 19 ]] -then - INSTALL_PACKAGES+=(\ - bats - btrfs-progs - fuse3 - libbtrfs-dev - libfuse3-dev - ) -else - echo "Downloading version of bats with fix for a \$IFS related bug in 'run' command" - cd /tmp - BATS_URL='http://launchpadlibrarian.net/438140887/bats_1.1.0+git104-g1c83a1b-1_all.deb' - curl -L -O "$BATS_URL" - cd - - INSTALL_PACKAGES+=(\ - /tmp/$(basename $BATS_URL) - btrfs-tools - ) -fi - # Do this at the last possible moment to avoid dpkg lock conflicts echo "Upgrading all packages" $BIGTO ooe.sh $SUDOAPTGET upgrade |