From: Michał Kępień <michal@isc.org>
Date: Tue, 4 Feb 2020 10:39:27 +0000 (+0100)
Subject: Update GitLab CI to OpenBSD 6.6
X-Git-Tag: v9.14.11~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e2cb827795ae2fec34fde8c25cdb58a487b752a;p=thirdparty%2Fbind9.git

Update GitLab CI to OpenBSD 6.6

Since OpenBSD 6.6 is the current OpenBSD release, replace OpenBSD 6.5
GitLab CI jobs with their up-to-date counterparts.

As CI jobs for OpenBSD 6.6 will be run by a generalized libvirt executor
rather than an OpenBSD-specific one, make the necessary tag and variable
adjustments as well.

(cherry picked from commit 99ed3a0e132991aae2ecd2f67a498b29d243bf60)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc769ec5a72..d86ec6bf246 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ stages:
 
 .openbsd-amd64: &openbsd_amd64
   tags:
-    - openbsd
+    - libvirt
     - amd64
 
 ### Docker Image Templates
@@ -966,20 +966,23 @@ unit:clang:freebsd12.0:amd64:
     - clang:freebsd12.0:amd64
   needs: ["clang:freebsd12.0:amd64"]
 
-# Jobs for Clang builds on OpenBSD 6.5 (amd64)
+# Jobs for Clang builds on OpenBSD 6.6 (amd64)
 
-clang:openbsd6.5:amd64:
+clang:openbsd6.6:amd64:
   variables:
     CC: clang
+    USER: gitlab-runner
   <<: *openbsd_amd64
   <<: *build_job
 
-system:clang:openbsd6.5:amd64:
+system:clang:openbsd6.6:amd64:
   <<: *openbsd_amd64
   <<: *system_test_job
+  variables:
+    USER: gitlab-runner
   dependencies:
-    - clang:openbsd6.5:amd64
-  needs: ["clang:openbsd6.5:amd64"]
+    - clang:openbsd6.6:amd64
+  needs: ["clang:openbsd6.6:amd64"]
   only:
     - schedules
     - tags
diff --git a/PLATFORMS b/PLATFORMS
index 38ab8d01211..b19f1e3dcf1 100644
--- a/PLATFORMS
+++ b/PLATFORMS
@@ -15,15 +15,16 @@ offer support on a "best effort" basis for some.
 
 Regularly tested platforms
 
-As of Feb 2019, BIND 9.14 is fully supported and regularly tested on the
+As of Feb 2020, BIND 9.14 is fully supported and regularly tested on the
 following systems:
 
   * Debian 8, 9, 10
-  * Ubuntu 16.04, 18.04
+  * Ubuntu LTS 16.04, 18.04
   * Fedora 31
-  * Red Hat Enterprise Linux / CentOS 6, 7
-  * FreeBSD 11.x
-  * OpenBSD 6.2, 6.3
+  * Red Hat Enterprise Linux / CentOS 6, 7, 8
+  * FreeBSD 11.3, 12.0
+  * OpenBSD 6.6
+  * Alpine Linux
 
 The amd64, i386, armhf and arm64 CPU architectures are all fully
 supported.
@@ -40,8 +41,6 @@ Server 2012 R2, none of these are tested regularly by ISC.
   * Windows 10 / x64
   * macOS 10.12+
   * Solaris 11
-  * FreeBSD 10.x, 12.0+
-  * OpenBSD 6.4+
   * NetBSD
   * Other Linux distributions still supported by their vendors, such as:
       + Ubuntu 14.04, 18.10+
diff --git a/PLATFORMS.md b/PLATFORMS.md
index eac62cd67cd..e4cf6b82dca 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -23,15 +23,16 @@ offer support on a "best effort" basis for some.
 
 ### Regularly tested platforms
 
-As of Feb 2019, BIND 9.14 is fully supported and regularly tested on the
+As of Feb 2020, BIND 9.14 is fully supported and regularly tested on the
 following systems:
 
 * Debian 8, 9, 10
-* Ubuntu 16.04, 18.04
+* Ubuntu LTS 16.04, 18.04
 * Fedora 31
-* Red Hat Enterprise Linux / CentOS 6, 7
-* FreeBSD 11.x
-* OpenBSD 6.2, 6.3
+* Red Hat Enterprise Linux / CentOS 6, 7, 8
+* FreeBSD 11.3, 12.0
+* OpenBSD 6.6
+* Alpine Linux
 
 The amd64, i386, armhf and arm64 CPU architectures are all fully supported.
 
@@ -47,8 +48,6 @@ Server 2012 R2, none of these are tested regularly by ISC.
 * Windows 10 / x64
 * macOS 10.12+
 * Solaris 11
-* FreeBSD 10.x, 12.0+
-* OpenBSD 6.4+
 * NetBSD
 * Other Linux distributions still supported by their vendors, such as:
     * Ubuntu 14.04, 18.10+