[cci] Various fixes and improvements

- fix centos:7 distcheck
- use centos to build the dist tarball
- simplify git cloning with builtin command
- no need for ssh when building
- tar the dsc files with the deb ones
- use the regular pkg repo now that the alpine PR has been merged

.circleci/config.yml

@@ -47,10 +47,9 @@ commands:
                 make \
                 openssh-clients \
                 pcre-devel \
-                python-docutils \
-                python3-sphinx \
+                python3 \
+                python-sphinx \
                 rst2pdf \
-                ssh \
                 sudo
   alpine_install_build_deps:
     description: Install build dependencies
@@ -138,11 +137,12 @@ jobs:
           name: Import the packages into the workspace
           command: |
             mkdir debs
-            mv ../*.deb debs/
+            mv ../*.deb ../*.dsc debs/
       - persist_to_workspace:
           root: .
           paths:
             - debs/varnish*.deb
+            - debs/varnish*.dsc
   build_alpine:
     description: Build alpine apks
     docker:
@@ -203,23 +203,15 @@ jobs:
           root: .
           paths:
             - apks/*.apk
-  dist_ubuntu:
+  dist:
     docker:
-      - image: ubuntu:bionic
+      - image: centos:7
     steps:
-      - run:
-          command: |
-            export DEBIAN_FRONTEND=noninteractive
-            export DEBCONF_NONINTERACTIVE_SEEN=true
-            apt-get update
-            apt-get install -y python3-sphinx autoconf automake libedit-dev make libtool pkg-config git libconfig-dev libpcre3-dev
+      - centos_install_build_deps
+      - checkout
       - run:
           name: Create the dist tarball
           command: |
-            mkdir -p ~/.ssh
-            ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-            git clone --branch=${CIRCLE_BRANCH} ${CIRCLE_REPOSITORY_URL} .
-            git checkout ${CIRCLE_SHA1}
             ./autogen.des --quiet
             make dist -j 16
       - persist_to_workspace:
@@ -241,7 +233,7 @@ jobs:
             mkdir -p ~/.ssh
             ssh-keyscan -H github.com >> ~/.ssh/known_hosts
             echo ${CIRCLE_REPOSITORY_URL}
-            git clone --branch=alpine https://github.com/gquintard/pkg-varnish-cache.git .
+            git clone --branch=weekly https://github.com/varnishcache/pkg-varnish-cache.git .
             git checkout alpine
             tar cvzf debian.tar.gz debian --dereference
             tar cvzf redhat.tar.gz redhat --dereference 
@@ -309,9 +301,7 @@ jobs:
       - run:
           name: Tar the packages
           command: |
-              rm rpms/varnish*.src.rpm
-              mv rpms/*/*.rpm rpms/
-              tar cvzf packages.tar.gz rpms/*.rpm debs/*.deb apks/*.apk
+              tar cvzf packages.tar.gz rpms/*.rpm debs/*.deb debs/*.dsc apks/*.apk
       - store_artifacts:
           destination: packages.tar.gz
           path: packages.tar.gz
@@ -401,14 +391,14 @@ jobs:
 
 pkg_req: &pkg_req
   requires:
-    - dist_ubuntu
+    - dist
     - tar_pkg_tools
 
 workflows:
   version: 2
   build:
     jobs:
-      - dist_ubuntu
+      - dist
       - tar_pkg_tools
       - build_debs:
           name: build_debian_stretch
@@ -442,23 +432,23 @@ workflows:
             - build_ubuntu_bionic
             - build_centos_7
             - build_alpine
-#      - distcheck:
-#          name: distcheck_centos_7
-#          dist: centos
-#          release: "7"
-#          requires:
-#            - dist_ubuntu
+      - distcheck:
+          name: distcheck_centos_7
+          dist: centos
+          release: "7"
+          requires:
+            - dist
       - distcheck:
           name: distcheck_debian_buster
           dist: debian
           release: buster
           extra_conf: --enable-asan --enable-ubsan
           requires:
-            - dist_ubuntu
+            - dist
       - distcheck:
           name: distcheck_alpine_3.10
           dist: alpine
           release: "latest"
           #extra_conf: --without-jemalloc
           requires:
-            - dist_ubuntu
+            - dist