From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Tue, 11 Feb 2020 08:16:02 +0000 (+0500)
Subject: BUILD: cirrus-ci: switch to "snap" images to unify openssl naming
X-Git-Tag: v2.2-dev3~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eccb2b4bd99e2f69a79afb8fe5a1a18636ff9742;p=thirdparty%2Fhaproxy.git

BUILD: cirrus-ci: switch to "snap" images to unify openssl naming

"snap" images are updated frequently, while regular images are updated quarterly.
so, mixing "snap" and regular images lead to package naming mismatch, which will occur every
quarter. we cannot use 11.3 release image, it is broken, so we have to use 11.3 "snap" image.
Thus let us use all "snap" images. 13-snap is first introduced with this commit.
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 4143e687bf..d528083585 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,17 +1,12 @@
 FreeBSD_task:
   freebsd_instance:
     matrix:
-      image_family: freebsd-12-1
+      image_family: freebsd-13-0-snap
+      image_family: freebsd-12-1-snap
       image_family: freebsd-11-3-snap
   only_if: $CIRRUS_BRANCH =~ 'master|next'
   install_script:
-    - case `uname -r` in
-        11.3*)
-          export SSL=openssl;;
-        12.1*)
-          export SSL=openssl111;;
-      esac
-    - pkg install -y $SSL git gmake lua53 socat
+    - pkg install -y openssl git gmake lua53 socat
   script:
     - git clone https://github.com/VTest/VTest.git ../vtest
     - make -C ../vtest