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

* Add git 2.20.1 to support protocol version 2. T256844
* Remove stretch-backports. T257327

Bug: T256844
Bug: T257327
Change-Id: Ic47093bd422865dbb0ad26968acc5d5784e6985d

Author: hashar

jjb/analytics.yaml

@@ -62,7 +62,7 @@
               -e GIT_AUTHOR_NAME="{git-user}"
               -e GIT_COMMITTER_NAME="{git-user}"
               -e EMAIL="{git-user-email}"
-          image: docker-registry.wikimedia.org/releng/java8:0.6.3
+          image: docker-registry.wikimedia.org/releng/java8:0.6.4-s1
           args: >-
               -Dresume=false
               -Djdk.net.URLClassPath.disableClassPathURLCheck=true
@@ -200,7 +200,7 @@
                 --volume "$(pwd)"/src:/src
                 --workdir /src/pageviews_reports
                 --entrypoint=/usr/bin/prove
-            image: 'docker-registry.wikimedia.org/releng/perl:5.24.1'
+            image: 'docker-registry.wikimedia.org/releng/perl:5.24.1-s2'
             args: '-v -Ilib/ t/'
     publishers:
         - docker-cleanup

jjb/integration.yaml

@@ -30,7 +30,7 @@
             projects: >
                 integration/config
         - docker-run-with-log-cache-src:
-            image: 'docker-registry.wikimedia.org/releng/tox:0.4.4'
+            image: 'docker-registry.wikimedia.org/releng/tox:0.4.4-s1'
             options: '--workdir=/src/integration/config --entrypoint=/src/integration/config/{entrypoint}'
     publishers:
         - castor-save-workspace-cache
@@ -55,7 +55,7 @@
      - docker-src-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/php72:0.2.7'
+         image: 'docker-registry.wikimedia.org/releng/php72:0.2.7-s1'
          args: '/src/vendor/bin/composer --version'
     publishers:
      - docker-cleanup
@@ -85,7 +85,7 @@
      - docker-cache-dir
      - docker-log-dir
      - docker-run-with-log-and-workspace-cache:
-         image: 'docker-registry.wikimedia.org/releng/tox:0.4.4'
+         image: 'docker-registry.wikimedia.org/releng/tox:0.4.4-s1'
          args: '-e qa -- --xunit-file=/log/junit-qa.xml'
     publishers:
      - archive-log-dir
@@ -115,7 +115,7 @@
     name: 'integration-pipelinelib'
     jobs:
      - '{name}-docker-doc-publish':
-         image: 'docker-registry.wikimedia.org/releng/gradle:0.3.0'
+         image: 'docker-registry.wikimedia.org/releng/gradle:0.3.0-s2'
          args: 'groovydoc'
          docsrc: 'src/build/docs/groovydoc'
          docdest: 'pipelinelib'

jjb/job-templates.yaml

@@ -21,7 +21,7 @@
       - docker-log-dir
       - docker-ci-src-setup-simple
       - docker-run-with-log-cache-src:
-          image: 'docker-registry.wikimedia.org/releng/gerrit:0.1.0-s8'
+          image: 'docker-registry.wikimedia.org/releng/gerrit:0.1.0-s9'
           options: '--volume /srv/git:/srv/git:ro'
     publishers:
       - archive:
@@ -34,7 +34,7 @@
 - job-template: &job_template_maven-java8-docker
     name: '{name}-maven-java8-docker'
     node: Docker
-    docker_image_var: docker-registry.wikimedia.org/releng/java8:0.5.1
+    docker_image_var: docker-registry.wikimedia.org/releng/java8:0.6.4-s1
     triggers:
         - zuul
     maven_args: 'clean verify'
@@ -97,7 +97,7 @@
     name: '{name}-maven-java8-docker-site-publish'
     node: Docker
     concurrent: false
-    docker_image_var: docker-registry.wikimedia.org/releng/java8:0.5.1
+    docker_image_var: docker-registry.wikimedia.org/releng/java8:0.6.4-s1
     triggers:
         - zuul
     builders:
@@ -195,7 +195,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1'
+        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1-s1'
     publishers:
      - archive-log-allow-empty
      - castor-save-workspace-cache
@@ -213,7 +213,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1'
+        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1-s1'
         args: '{script}'
     publishers:
      - archive-log-allow-empty
@@ -230,7 +230,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10:0.5.2'
+        image: 'docker-registry.wikimedia.org/releng/node10:0.5.2-s1'
         options: '--workdir="/src"'
         args: 'audit'
     publishers:
@@ -260,7 +260,7 @@
     - docker-log-dir
     - docker-ci-src-setup-simple
     - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10:0.5.2'
+        image: 'docker-registry.wikimedia.org/releng/node10:0.5.2-s1'
         options: '--workdir="/src"'
         args: 'audit'
     publishers:
@@ -298,7 +298,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10-test-browser:0.6.3'
+        image: 'docker-registry.wikimedia.org/releng/node10-test-browser:0.6.3-s1'
      - cover-publish:
         src: 'src/coverage'
         dest: '$DOC_PROJECT'
@@ -320,7 +320,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1'
+        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1-s1'
         args: 'doc'
      - doc-publish:
         docsrc: 'src/docs'
@@ -342,7 +342,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1'
+        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1-s1'
         args: 'doc'
      - doc-publish:
         docsrc: 'src/docs'
@@ -417,15 +417,15 @@
 - job-template:
     !!merge : *job_npm-node-6-docker
     name: '{name}-npm-browser-node-6-docker'
-    docker_image_var: 'docker-registry.wikimedia.org/releng/npm-browser-test:0.5.1'
+    docker_image_var: 'docker-registry.wikimedia.org/releng/npm-browser-test:0.5.1-s1'
     # Reinject Zuul parameters since JJB strip for some reason
     triggers:
      - zuul
 
 - job-template:
     !!merge : *job_npm-run-script-node-6-docker
     name: 'selenium-daily-{sitename}-{project}'
-    docker_image_var: 'docker-registry.wikimedia.org/releng/node10-test-browser:0.6.3'
+    docker_image_var: 'docker-registry.wikimedia.org/releng/node10-test-browser:0.6.3-s1'
     triggers:
      - timed: '@daily'
     parameters:

jjb/labs.yaml

@@ -4,14 +4,14 @@
     name: 'labs-tools-heritage'
     jobs:
         - '{name}-tox-docker':
-            docker_image_var: docker-registry.wikimedia.org/releng/tox-pywikibot:0.4.0
+            docker_image_var: docker-registry.wikimedia.org/releng/tox-pywikibot:0.4.0-s2
             build_timeout: 6  # T206913
 
 - project:
     name: 'labs-striker'
     jobs:
         - '{name}-tox-docker':
-            docker_image_var: docker-registry.wikimedia.org/releng/tox-labs-striker:0.4.0
+            docker_image_var: docker-registry.wikimedia.org/releng/tox-labs-striker:0.4.0-s2
 
 - project:
     name: 'labs-tools-wikibugs2'
@@ -27,7 +27,7 @@
          days-to-keep: 15
     builders:
      - docker-run:
-         image: docker-registry.wikimedia.org/releng/curl:0.1.0
+         image: docker-registry.wikimedia.org/releng/curl:0.1.0-s2
          args: '--fail --silent --show-error --max-time 10 https://tools.wmflabs.org/wikibugs/pull.php'
     publishers:
      - docker-cleanup
@@ -48,7 +48,7 @@
     name: 'labs-tools-map-of-monuments'
     jobs:
        - '{name}-tox-docker':
-           docker_image_var: docker-registry.wikimedia.org/releng/tox-mysqld:0.4.2
+           docker_image_var: docker-registry.wikimedia.org/releng/tox-mysqld:0.4.2-s1
 
 - project:
     name: 'labs-tools-commons-mass-description'
@@ -79,7 +79,7 @@
     name: 'labs-tools-wikinity'
     jobs:
        - '{name}-tox-docker':
-           docker_image_var: docker-registry.wikimedia.org/releng/tox-mysqld:0.4.2
+           docker_image_var: docker-registry.wikimedia.org/releng/tox-mysqld:0.4.2-s1
 
 - project:
     name: 'labs-tools-ipwatcher'

jjb/language-screenshots.yaml

@@ -72,14 +72,14 @@
         - docker-ci-src-setup-simple
         # screenshot all the things
         - docker-run-with-log-cache-src:
-            image: 'docker-registry.wikimedia.org/releng/node10-test-browser:0.6.3'
+            image: 'docker-registry.wikimedia.org/releng/node10-test-browser:0.6.3-s1'
             # credentials for screenshots
             options: '--env SAUCE_ONDEMAND_USERNAME=wikimedia-jenkins'
             # npm run-script screenshots-all
             args: screenshots-all
         # Upload all the things
         - docker-run-with-log-cache-src:
-            image: 'docker-registry.wikimedia.org/releng/rake:0.2.1'
+            image: 'docker-registry.wikimedia.org/releng/rake:0.2.1-s2'
             # Options for commons_upload gem
             options: '--env MEDIAWIKI_API_UPLOAD_URL=https://commons.wikimedia.org/w/api.php --env MEDIAWIKI_USER=LanguageScreenshotBot --env MEDIAWIKI_PASSWORD="$LanguageScreenshotBot"'
             # bundle exec rake ...

jjb/macro-docker.yaml

@@ -193,7 +193,7 @@
      # Install the extension/skin composer dev dependencies to bring in phan config
      - docker-run-with-log-cache-src:
         options: '--volume "$(pwd)"/src:/mediawiki'
-        image: 'docker-registry.wikimedia.org/releng/composer-php72:0.3.0-s2'
+        image: 'docker-registry.wikimedia.org/releng/composer-php72:0.3.0-s3'
         args: '--working-dir=/src/"$THING_SUBNAME" update --ansi --no-progress --prefer-dist --profile'
 
 # Use a docker image to clone the repository into /src with explicit options.
@@ -230,7 +230,7 @@
         options: >-
           --volume "$(pwd)"/src:/src
           --volume /srv/git:/srv/git:ro
-        image: 'docker-registry.wikimedia.org/releng/zuul-cloner:0.2.1'
+        image: 'docker-registry.wikimedia.org/releng/zuul-cloner:0.2.1-s1'
         args: >-
           --color --verbose
           --map /zuul-clonemap.yaml

jjb/mediawiki-extensions.yaml

@@ -74,7 +74,7 @@
      - docker-setup-mwext-for-phan
      - docker-run-with-log-cache-src:
         options: '--volume "$(pwd)"/src:/mediawiki'
-        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan:0.8.0'
+        image: 'docker-registry.wikimedia.org/releng/mediawiki-phan:0.8.0-s1'
         args: '-m checkstyle'
     publishers:
      - checkstyle:

jjb/mediawiki-misc.yaml

@@ -9,7 +9,7 @@
      - docker-log-dir
      - docker-src-dir
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1'
+         image: 'docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1-s2'
          args: 'doc'
      - doc-publish:
         docsrc: 'src/doc'
@@ -37,6 +37,6 @@
     name: 'mediawiki-vagrant'
     jobs:
      - '{name}-rake-docker':
-         docker_image_var: docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1
+         docker_image_var: docker-registry.wikimedia.org/releng/rake-vagrant:0.2.1-s2
          build_timeout: 10  # minutes
      - 'mediawiki-vagrant-puppet-doc-publish'

jjb/mediawiki-services.yaml

@@ -23,7 +23,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10-kartotherian:0.1.2-s2'
+        image: 'docker-registry.wikimedia.org/releng/node10-kartotherian:0.1.2-s3'
     publishers:
      - archive-log-allow-empty
      - castor-save-workspace-cache
@@ -38,7 +38,7 @@
     name: poolcounter
     jobs:
         - '{name}-tox-docker':
-            docker_image_var: docker-registry.wikimedia.org/releng/tox-poolcounter:0.4.0
+            docker_image_var: docker-registry.wikimedia.org/releng/tox-poolcounter:0.4.0-s2
 
 - project:
     name: recommendation-api
@@ -76,7 +76,7 @@
      - docker-log-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1'
+        image: 'docker-registry.wikimedia.org/releng/node10-test:0.6.1-s1'
         args: 'periodic'
     publishers:
      - irc-wikimedia-infrastructure

jjb/mediawiki-tools.yaml

@@ -43,7 +43,7 @@
       - docker-log-dir
       - docker-src-dir
       - docker-run-with-log-cache-src:
-          image: 'docker-registry.wikimedia.org/releng/tox:0.4.4'
+          image: 'docker-registry.wikimedia.org/releng/tox:0.4.4-s1'
           args: '-e doc'
       - doc-publish:
           docsrc: 'src/docs/_build/html'
@@ -70,7 +70,7 @@
              mediawiki/core
              mediawiki/tools/codesniffer
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.3.0-s2'
+         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.3.0-s3'
          options: '--workdir /src/mediawiki/tools/codesniffer'
          args: 'install --ansi --no-progress --prefer-dist --profile --no-dev'
      - docker-run-with-log-cache-src:
@@ -82,7 +82,7 @@
          options: '--user=nobody --entrypoint=/bin/mv'
          args: '/src/mediawiki/tools/codesniffer /src/vendor/mediawiki/mediawiki-codesniffer'
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.3.0-s2'
+         image: 'docker-registry.wikimedia.org/releng/composer-php72:0.3.0-s3'
          options: '--workdir /src --entrypoint=/src/vendor/mediawiki/mediawiki-codesniffer/vendor/bin/phpcs'
          args: '-s -p'
     publishers:
@@ -107,7 +107,7 @@
              mediawiki/core
              mediawiki/tools/phan
      - docker-run-with-log-cache-src:
-         image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-testrun:0.1.5-s5'
+         image: 'docker-registry.wikimedia.org/releng/mediawiki-phan-testrun:0.1.5-s6'
          options: '--workdir /src'
     publishers:
      - castor-save-workspace-cache