From 609ea92718801e3c1ce1b572bea185ee789fe0a3 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 31 Jan 2022 09:41:31 +0100
Subject: [PATCH] ci: move the OpenSSL + c-ares job from Zuul to Circle CI

Closes #8357
---
 .circleci/config.yml | 29 ++++++++++++++++++++++++++++-
 zuul.d/jobs.yaml     | 13 -------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd0ef0fb6a..5421a1671f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 2021, 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -33,6 +33,19 @@ commands:
             ./buildconf
             ./configure --enable-warnings --enable-werror --with-openssl
 
+  install-cares:
+    steps:
+      - run:
+          command: |
+            sudo apt-get update && sudo apt-get install -y libc-ares-dev
+
+  configure-cares:
+    steps:
+      - run:
+          command: |
+            ./buildconf
+            ./configure --enable-warnings --enable-werror --with-openssl --enable-ares
+
   build:
     steps:
       - run: make V=1
@@ -56,6 +69,15 @@ jobs:
       - build
       - test
 
+  cares:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-cares
+      - configure-cares
+      - build
+      - test
+
   arm:
     machine:
       image: ubuntu-2004:202101-01
@@ -70,6 +92,11 @@ workflows:
   x86-openssl:
     jobs:
       - basic
+      - cares
+
+  openssl-c-ares:
+    jobs:
+      - cares
 
   arm-openssl:
     jobs:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 340ca7e7de..ad36ae5d14 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -53,18 +53,6 @@
         - libbrotli-dev
         - libzstd-dev
 
-- job:
-    name: curl-normal-with-openssl-enable-ares
-    parent: curl-base
-    vars:
-      curl_env:
-        CC: gcc-8
-        CXX: g++-8
-        T: normal
-        C: >-
-          --with-openssl
-          --enable-ares
-
 - job:
     name: curl-normal-with-openssl-disable-proxy
     parent: curl-base
@@ -443,7 +431,6 @@
     check:
       jobs:
       - curl-normal-with-openssl-gssapi-libssh2-checksrc
-      - curl-normal-with-openssl-enable-ares
       - curl-normal-with-openssl-disable-proxy
       - curl-normal-with-openssl-disable-verbose-notests
       - curl-novalgrind-boringssl-with-openssl
-- 
2.47.3