CI: move 'distcheck' job from zuul to azure pipelines

Assisted-by: Kushal Das
Closes #8334

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 6f194c33f2cd6c77046d48d3b25ca35be23e63a4..7d4e7741a471fd54c480e87c49564042053749a5 100644 (file)
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 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
@@ -94,6 +94,65 @@ stages:
         AZURE_ACCESS_TOKEN: "$(System.AccessToken)"
         TFLAGS: "-r $(tests)"
 
+- stage: distcheck
+  dependsOn: []
+  jobs:
+  - job: ubuntu
+    timeoutInMinutes: 20
+    pool:
+      vmImage: 'ubuntu-latest'
+    strategy:
+      matrix:
+        default:
+          name: default
+          install:
+    steps:
+    - script: ./buildconf && ./configure --without-ssl
+      displayName: 'configure $(name)'
+
+    - script: make && ./maketgz 99.98.97
+      displayName: 'make tarball'
+
+    - script: |
+        tar xf curl-99.98.97.tar.gz
+        cd curl-99.98.97
+        ./configure --prefix=$HOME/temp --without-ssl
+        make
+        make TFLAGS=1 test
+        make install
+        # basic check of the installed files
+        cd ..
+        bash scripts/installcheck.sh $HOME/temp
+        rm -rf curl-99.98.97
+
+      displayName: 'verify in-tree configure build'
+
+    - script: |
+        # verify out-of-tree build
+        tar xf curl-99.98.97.tar.gz
+        touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
+        mkdir build
+        cd build
+        ../curl-99.98.97/configure --without-ssl
+        make
+        make TFLAGS='-p 1 1139' test
+        # verify cmake build
+        cd ..
+        rm -rf curl-99.98.97
+
+      displayName: 'verify out-of-tree configure build'
+
+    - script: |
+        tar xf curl-99.98.97.tar.gz
+        cd curl-99.98.97
+        mkdir build
+        cd build
+        cmake ..
+        make
+
+      displayName: 'verify out-of-tree cmake build'
+
+
 ##########################################
 ### Windows jobs below
 ##########################################

diff --git a/scripts/zuul/script.sh b/scripts/zuul/script.sh
index 121dea74b78d78aafc1d61bd6252a7249e05d102..79ef8899bfaaf21f90c63f3d83b678abf813f859 100755 (executable)
--- a/scripts/zuul/script.sh
+++ b/scripts/zuul/script.sh
@@ -108,43 +108,6 @@ if [ "$T" = "cmake" ]; then
   env TFLAGS="!1139 $TFLAGS" cmake --build build --target test-nonflaky
 fi
 
-if [ "$T" = "distcheck" ]; then
-  # find BOM markers and exit if we do
-  ! git grep `printf '\xef\xbb\xbf'`
-  ./configure --without-ssl
-  make
-  ./maketgz 99.98.97
-  # verify in-tree build - and install it
-  tar xf curl-99.98.97.tar.gz
-  cd curl-99.98.97
-  ./configure --prefix=$HOME/temp --without-ssl
-  make
-  make TFLAGS=1 test
-  make install
-  # basic check of the installed files
-  cd ..
-  bash scripts/installcheck.sh $HOME/temp
-  rm -rf curl-99.98.97
-  # verify out-of-tree build
-  tar xf curl-99.98.97.tar.gz
-  touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
-  mkdir build
-  cd build
-  ../curl-99.98.97/configure --without-ssl
-  make
-  make TFLAGS='-p 1 1139' test
-  # verify cmake build
-  cd ..
-  rm -rf curl-99.98.97
-  tar xf curl-99.98.97.tar.gz
-  cd curl-99.98.97
-  mkdir build
-  cd build
-  cmake ..
-  make
-  cd ../..
-fi
-
 if [ "$T" = "fuzzer" ]; then
   # Download the fuzzer to a temporary folder
   ./tests/fuzz/download_fuzzer.sh /tmp/curl_fuzzer

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 52cd65c60504cb4d62a6bffcd184a7f7023e4394..9ce3dd8f961b771839471a96fd1d4c2fa21ccf95 100644 (file)
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -379,19 +379,6 @@
         CXX: g++-8
         T: events
 
-- job:
-    name: curl-distcheck
-    parent: curl-base
-    vars:
-      curl_apt_packages:
-        - libpsl-dev
-        - libbrotli-dev
-        - libzstd-dev
-      curl_env:
-        CC: gcc-8
-        CXX: g++-8
-        T: distcheck
-
 - job:
     name: curl-fuzzer
     parent: curl-base
@@ -495,7 +482,6 @@
       - curl-cmake-ngtcp2
       - curl-torture
       - curl-events
-      - curl-distcheck
       - curl-fuzzer
       - curl-tidy
       - curl-scan-build