Backed out 4 changesets (bug 1732228, bug 1734402) for causing mda failures. CLOSED TREE

Backed out changeset fe7621bd33fe (bug 1732228)
Backed out changeset 61a521ac78e9 (bug 1732228)
Backed out changeset abf785b6ffe4 (bug 1734402)
Backed out changeset e1f91aaed4c3 (bug 1734402)

mach

@@ -35,10 +35,10 @@ def check_and_get_mach(dir_path):
 
 
 def main(args):
-    # Ensure we are running Python 3.7+. We run this check as soon as
+    # Ensure we are running Python 3.6+. We run this check as soon as
     # possible to avoid a cryptic import/usage error.
-    if sys.version_info < (3, 7):
-        print("Python 3.7+ is required to run mach.")
+    if sys.version_info < (3, 6):
+        print("Python 3.6+ is required to run mach.")
         print("You are running Python {0}".format(platform.python_version()))
         if sys.platform.startswith("linux"):
             print(dedent("""

taskcluster/ci/docker-image/kind.yml

@@ -42,11 +42,11 @@ jobs:
         parent: ubuntu1804-i386-raw
     ubuntu1804-base:
         symbol: I(ub18-base)
+        definition: debian-base
         parent: ubuntu1804-raw
         packages:
             - ub18-mercurial
             - ub18-python-zstandard
-            - ub18-python-psutil
     ubuntu1804-test-base:
         symbol: I(ub18-test-base)
         parent: ubuntu1804-base

taskcluster/ci/packages/ubuntu.yml

@@ -28,19 +28,6 @@ ub18-32-libc6:
         arch: i386
         patch: ubuntu-glibc.diff
 
-ub18-python-psutil:
-    description: "python-psutil for Ubuntu bionic"
-    treeherder:
-        symbol: Ub18(python-psutil)
-    run:
-        dsc:
-            url: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-psutil/5.4.2-1ubuntu0.1/python-psutil_5.4.2-1ubuntu0.1.dsc
-            sha256: a0ca4560d25fcfe5b7407d2cb21318f0635f2c3559898efce1679eef35b61f05
-        name: python-psutil
-        pre-build-command: >-
-            apt-get install python3.7-dev python3.7-dbg &&
-            export DEBPYTHON3_SUPPORTED="3.7"
-
 ub18-python-zstandard:
     description: "python-zstandard for Ubuntu bionic"
     treeherder:
@@ -50,10 +37,7 @@ ub18-python-zstandard:
             url: https://github.com/indygreg/python-zstandard/releases/download/0.19.0/zstandard-0.19.0.tar.gz
             sha256: 31d12fcd942dd8dbf52ca5f6b1bbe287f44e5d551a081a983ff3ea2082867863
         name: python-zstandard
-        pre-build-command: >-
-            apt-get install python3.7-dev &&
-            export DEBPYTHON3_SUPPORTED="3.7" &&
-            debchange -v 0.19.0-1.ub18moz --distribution bionic "Mozilla backport for bionic"
+        pre-build-command: debchange -v 0.19.0-1.ub18moz --distribution bionic "Mozilla backport for bionic"
 
 ub18-mercurial:
     description: "Modern Mercurial for Ubuntu bionic"
@@ -64,9 +48,6 @@ ub18-mercurial:
             url: https://www.mercurial-scm.org/release/mercurial-5.8.1.tar.gz
             sha256: 81baa3fe2087bdda2dd119d7ea948f6badebaeb7b528a7d18b277e2ceb22b19b
         pre-build-command: >-
-            apt-get install python3.7-dev &&
-            export DEB_HG_PYTHON_VERSIONS="3.7" &&
-            export DEBPYTHON3_SUPPORTED="3.7" &&
             cp -r contrib/packaging/debian debian &&
             sed -i -e "s/__VERSION__/$(awk -F\" '$2 {print $2}' mercurial/__version__.py)-1.ub18moz1/" \
                          -e "s/__DATE__/$(date --rfc-2822)/" \

taskcluster/docker/ubuntu1804-base/Dockerfile

@@ -1,70 +0,0 @@
-FROM $DOCKER_IMAGE_PARENT
-MAINTAINER Mike Hommey <mhommey@mozilla.com>
-
-### Add worker user and setup its workspace.
-RUN mkdir /builds && \
-    groupadd -g 1000 worker && \
-    useradd -u 1000 -g 1000 -d /builds/worker -s /bin/bash -m worker && \
-    mkdir -p /builds/worker/workspace && \
-    chown -R worker:worker /builds
-
-# Declare default working folder
-WORKDIR /builds/worker
-
-VOLUME /builds/worker/checkouts
-VOLUME /builds/worker/workspace
-VOLUME /builds/worker/tooltool-cache
-
-# Set variable normally configured at login, by the shells parent process, these
-# are taken from GNU su manual
-ENV HOME=/builds/worker \
-    SHELL=/bin/bash \
-    USER=worker \
-    LOGNAME=worker \
-    HOSTNAME=taskcluster-worker
-
-# Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]
-
-ARG TASKCLUSTER_ROOT_URL
-ARG DOCKER_IMAGE_PACKAGES
-RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES && \
-    apt-get update && \
-    apt-get dist-upgrade && \
-    apt-get install \
-      git \
-      less \
-      make \
-      mercurial \
-      patch \
-      python3.7 \
-      python3.7-dev \
-      python3.7-venv \
-      python3-distutils-extra \
-      python3-minimal \
-      python3-zstandard \
-      python3-psutil \
-      python3-venv \
-      vim-tiny \
-      xz-utils \
-      zstd
-
-RUN test $(readlink /usr/bin/python3) = python3.6 && ln -sf python3.7 /usr/bin/python3
-
-# %include testing/mozharness/external_tools/robustcheckout.py
-COPY topsrcdir/testing/mozharness/external_tools/robustcheckout.py /usr/local/mercurial/robustcheckout.py
-
-# %include taskcluster/docker/recipes/hgrc
-COPY topsrcdir/taskcluster/docker/recipes/hgrc /etc/mercurial/hgrc.d/mozilla.rc
-
-# Add pip configuration, among other things.
-# %include taskcluster/docker/recipes/dot-config
-COPY topsrcdir/taskcluster/docker/recipes/dot-config /builds/worker/.config
-
-# %include taskcluster/scripts/run-task
-COPY topsrcdir/taskcluster/scripts/run-task /builds/worker/bin/run-task
-
-# %include taskcluster/scripts/misc/fetch-content
-ADD topsrcdir/taskcluster/scripts/misc/fetch-content /builds/worker/bin/fetch-content
-
-RUN chown -R worker:worker /builds/worker/bin && chmod 755 /builds/worker/bin/*

testing/mozharness/mozharness/base/python.py

@@ -479,7 +479,7 @@ class VirtualenvMixin(object):
                 / "python"
                 / "_venv"
                 / "wheels"
-                / "pip-23.0.1-py3-none-any.whl"
+                / "pip-21.2.3-py3-none-any.whl"
             )
             setuptools_wheel_path = (
                 src_dir
@@ -487,7 +487,7 @@ class VirtualenvMixin(object):
                 / "python"
                 / "_venv"
                 / "wheels"
-                / "setuptools-67.4.0-py3-none-any.whl"
+                / "setuptools-51.2.0-py3-none-any.whl"
             )
 
             if all(path.exists() for path in (pip_wheel_path, setuptools_wheel_path)):
@@ -530,8 +530,11 @@ class VirtualenvMixin(object):
                                     sys.executable, str(expected_python_debug_exe)
                                 )
 
+            # We install "--without-pip" since the version of pip bundled with
+            # python is not consistent across versions/platforms and could be
+            # incompatible. We don't use "--upgrade" to get the newest pip
+            # since that would tie us to pypy being available, which we don't want.
             self.mkdir_p(dirs["abs_work_dir"])
-
             self.run_command(
                 [sys.executable, "-m", "venv", "--without-pip", venv_path],
                 cwd=dirs["abs_work_dir"],
@@ -539,16 +542,6 @@ class VirtualenvMixin(object):
                 halt_on_failure=True,
             )
 
-            # To workaround an issue on Windows10 jobs in CI we have to
-            # explicitly install the default pip separately. Ideally we
-            # could just remove the "--without-pip" above and get the same
-            # result, but that's apparently not always the case.
-            self.run_command(
-                [str(venv_python_bin), "-m", "ensurepip", "--default-pip"],
-                cwd=dirs["abs_work_dir"],
-                halt_on_failure=True,
-            )
-
             self._ensure_python_exe(venv_python_bin.parent)
 
             # We can work around a bug on some versions of Python 3.6 on
@@ -565,11 +558,16 @@ class VirtualenvMixin(object):
                     new_venv_config = Path(venv_path) / "pyvenv.cfg"
                     shutil.copyfile(str(this_venv_config), str(new_venv_config))
 
+            # Since we didn't install pip, we can use the pip wheel directly
+            # to install pip itself, and setuptools afterwards. Doing this "self
+            # install" is faster than letting venv install the bundled pip only
+            # to uninstall it when it installs this vendored pip wheel. We set the
+            pip_path = pip_wheel_path / "pip"
+
             self.run_command(
                 [
                     str(venv_python_bin),
-                    "-m",
-                    "pip",
+                    str(pip_path),
                     "install",
                     "--only-binary",
                     ":all:",