From 14dd6928ff9e49e1280bec368ad7159a7d959c6d Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 31 Jan 2022 12:52:29 +0100
Subject: [PATCH] CI: move two jobs from Zuul to Circle CI

 - openssl-no-verbose
 - openssl-no-proxy

Closes #8359
---
 .circleci/config.yml | 45 ++++++++++++++++++++++++++++++++++++++++++++
 zuul.d/jobs.yaml     | 31 ------------------------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e51116f11..7a7d93802d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,12 +33,32 @@ commands:
             ./buildconf
             ./configure --enable-warnings --enable-werror --with-openssl
 
+  configure-openssl-no-verbose:
+    steps:
+      - run:
+          command: |
+            ./buildconf
+            ./configure --disable-verbose --enable-werror --with-openssl
+
+  configure-no-proxy:
+    steps:
+      - run:
+          command: |
+            ./buildconf
+            ./configure --disable-proxy --enable-werror --with-openssl
+
   install-cares:
     steps:
       - run:
           command: |
             sudo apt-get update && sudo apt-get install -y libc-ares-dev
 
+  install-deps:
+    steps:
+      - run:
+          command: |
+            sudo apt-get update && sudo apt-get install -y libpsl-dev libbrotli-dev libzstd-dev zlib1g-dev
+
   configure-cares:
     steps:
       - run:
@@ -76,6 +96,23 @@ jobs:
       - build
       - test
 
+  no-verbose:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-deps
+      - configure-openssl-no-verbose
+      - build
+
+  no-proxy:
+    executor: ubuntu
+    steps:
+      - checkout
+      - install-deps
+      - configure-no-proxy
+      - build
+      - test
+
   cares:
     executor: ubuntu
     steps:
@@ -115,6 +152,14 @@ workflows:
     jobs:
       - cares
 
+  openssl-no-proxy:
+    jobs:
+      - no-proxy
+
+  openssl-no-verbose:
+    jobs:
+      - no-verbose
+
   arm-openssl:
     jobs:
       - arm
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ad36ae5d14..b7df3ba191 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -53,35 +53,6 @@
         - libbrotli-dev
         - libzstd-dev
 
-- job:
-    name: curl-normal-with-openssl-disable-proxy
-    parent: curl-base
-    vars:
-      curl_env:
-        T: normal
-        TFLAGS: "!2034 !2037 !2041"
-        C: >-
-          --with-openssl
-          --disable-proxy
-
-- job:
-    name: curl-normal-with-openssl-disable-verbose-notests
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-      curl_env:
-        CC: gcc-8
-        CXX: g++-8
-        T: normal
-        C: >-
-          --with-openssl
-          --disable-verbose
-        CPPFLAGS: -Wno-variadic-macros
-        NOTESTS: 1
-
 - job:
     name: curl-novalgrind-boringssl-with-openssl
     parent: curl-base
@@ -431,8 +402,6 @@
     check:
       jobs:
       - curl-normal-with-openssl-gssapi-libssh2-checksrc
-      - curl-normal-with-openssl-disable-proxy
-      - curl-normal-with-openssl-disable-verbose-notests
       - curl-novalgrind-boringssl-with-openssl
       - curl-novalgrind-boringssl-with-openssl-quiche
       - curl-debug-bearssl
-- 
2.47.3