Revert "jjb: update quibble jobs for git v2 / drop stretch-backports"

This reverts commit 24bf326.

Reason for revert: New git protocol isn't working; clones are failing for most (all?) jobs.

Change-Id: Ia69d7ee1eb389fcf0c453ffd77ab813b74e3930e

Author: jdforrester

jjb/integration.yaml

@@ -131,7 +131,7 @@
       - docker-src-dir
       - docker-ci-src-setup-simple
       - docker-run-with-log-cache-src:
-          image: 'docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3'
+          image: 'docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2'
           options: >-
               -v /srv/git:/srv/git:ro
               -v "$(pwd)"/src:/src

jjb/macro-docker.yaml

@@ -169,7 +169,7 @@
     name: docker-setup-mwext-for-phan
     builders:
      - docker-run-with-log-cache-src:
-         image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+         image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
          options: >-
              --volume "$(pwd)/src:/workspace/src"
              --volume /srv/git:/srv/git:ro

jjb/mediawiki.yaml

@@ -367,7 +367,7 @@
         - mediawiki-quibble-api-testing-vendor-{database}-{php}-docker:
             php:
                 - php72:
-                    docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+                    docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
             packages-source: vendor
             database:
                 - mysql
@@ -442,7 +442,7 @@
     builders:
         - docker-log-dir
         - docker-run-with-log:
-            image: 'docker-registry.wikimedia.org/releng/quibble-fresnel:0.0.44-s3'
+            image: 'docker-registry.wikimedia.org/releng/quibble-fresnel:0.0.44-s2'
             options: '--volume /srv/git:/srv/git:ro --tmpfs /workspace/db:size=320M'
             args: '--packages-source vendor --db mysql --db-dir /workspace/db --skip-deps --commands "mediawiki-fresnel-patch"'
             logdir: '/workspace/log'
@@ -565,7 +565,7 @@
     - docker-src-dir
     - docker-castor-load
     - docker-run-with-log-and-workspace-cache:
-        image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s3
+        image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s2
         options: '-e CODEHEALTH=1 --volume "$(pwd)"/src:/workspace/src --volume "$(pwd)"/cover:/workspace/cover --volume /srv/git:/srv/git:ro --tmpfs /workspace/db:size=320M'
         args: '--packages-source "{packages-source}" --git-parallel=8 {quibble_args}'
         logdir: '/workspace/log'
@@ -662,7 +662,7 @@
     - docker-wipe-dir:
         dir: 'cover'
     - docker-run-with-log-and-workspace-cache:
-        image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s3
+        image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s2
         options: '-e CODEHEALTH=1 --volume "$(pwd)"/src:/workspace/src --volume "$(pwd)"/cover:/workspace/cover --volume /srv/git:/srv/git:ro'
         args: '--packages-source "{packages-source}" --git-parallel=8 --skip-install --commands=mwext-phpunit-coverage'
         logdir: '/workspace/log'
@@ -794,48 +794,48 @@
         - sqlite
     php:
         - php70:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php70:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php70:0.0.44-s2
         - php71:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php71:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php71:0.0.44-s2
         - php72:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
         - php73:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php73:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php73:0.0.44-s2
         - php74:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php74:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php74:0.0.44-s2
     jobs:
         - quibble-{packages-source}-{database}-{php}-docker
         - quibble-{packages-source}-{database}-{php}-noselenium-docker
         - quibble-{packages-source}-selenium-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
             database: 'mysql'
         - quibble-{packages-source}-{database}-{php}-phpunit-standalone-docker
         - mediawiki-quibble-{packages-source}-{database}-{php}-docker
         - mediawiki-quibble-composertest-{php}-docker
         - mediawiki-quibble-selenium-{packages-source}-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
             database: 'mysql'
         - mediawiki-quibble-apitests-{packages-source}-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
             database: 'mysql'
         - mwcore-phpunit-coverage-patch:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s2
             packages-source: vendor
             database: sqlite
         - mwcore-phpunit-coverage-master:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s2
             packages-source: vendor
             database: sqlite
         - mwext-phpunit-coverage-patch-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s2
             packages-source:  composer
             database: mysql
         - mwext-phpunit-coverage-docker-publish:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-coverage:0.0.44-s2
             packages-source:  composer
             database: mysql
         - mwselenium-quibble-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-bundle:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-bundle:0.0.44-s2
             packages-source: vendor
             database: mysql
 
@@ -850,7 +850,7 @@
     # And only php7.2
     php:
         - php72:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
     jobs:
         - wmf-quibble-vendor-mysql-{php}-docker
         - wmf-quibble-core-vendor-mysql-{php}-docker
@@ -867,7 +867,7 @@
     name: mediawiki-selenium-integration
     jobs:
         - mediawiki-selenium-integration-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-bundle:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-bundle:0.0.44-s2
 
             packages-source: vendor
             database: mysql
@@ -893,7 +893,7 @@
     name: parsoidsvc-parsertests
     jobs:
         - parsoidsvc-parsertests-docker:
-            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+            docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
             packages-source: composer
             database: sqlite
             quibble_args: '--commands=services/parsoid/tools/ci-mw-parsertests.sh'
@@ -911,7 +911,7 @@
 
 - project:
     name: wikibase
-    docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s3
+    docker_image: docker-registry.wikimedia.org/releng/quibble-stretch-php72:0.0.44-s2
     packages-source: composer
     kind:
         - client:

jjb/wm-fundraising.yaml

@@ -49,7 +49,7 @@
         - docker-castor-load
         - docker-log-dir
         - docker-run-with-log-and-workspace-cache:
-            image: docker-registry.wikimedia.org/releng/quibble-stretch-php70:0.0.44-s3
+            image: docker-registry.wikimedia.org/releng/quibble-stretch-php70:0.0.44-s2
             options: '--volume /srv/git:/srv/git:ro --tmpfs /workspace/db:size=320M'
             # With composer to get dependencies from DonationInterface. However we also clone mediawiki/vendor
             args: >
@@ -101,7 +101,7 @@
         - docker-castor-load
         - docker-log-dir
         - docker-run-with-log-and-workspace-cache:
-            image: docker-registry.wikimedia.org/releng/quibble-stretch-php70:0.0.44-s3
+            image: docker-registry.wikimedia.org/releng/quibble-stretch-php70:0.0.44-s2
             options: '--volume /srv/git:/srv/git:ro --tmpfs /workspace/db:size=320M'
             # With composer to get dependencies from DonationInterface. However we also clone mediawiki/vendor
             args: >