Backed out changeset 7e16fe72804a (bug 1619944) for causing gecko dec…

…ision bustage CLOSED TREE
Brli · Mar 5, 2020 · e21b92d · e21b92d
1 parent b623b4d
commit e21b92d
Show file tree

Hide file tree

Showing 19 changed files with 513 additions and 382 deletions.
diff --git a/.cron.yml b/.cron.yml
@@ -197,11 +197,11 @@ jobs:
           - {weekday: 'Monday', hour: 10, minute: 0}
           - {weekday: 'Thursday', hour: 10, minute: 0}
 
-    - name: python-dependency-update
+    - name: pipfile-update
       job:
           type: decision-task
           treeherder-symbol: Nfile
-          target-tasks-method: python_dependency_update
+          target-tasks-method: pipfile_update
       run-on-projects:
           - mozilla-central
       when:

diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
@@ -122,7 +122,7 @@ treeherder:
         'langpack': 'Langpack sigatures and uploads'
         'TPS': 'Sync tests'
         'UV': 'Update verify'
-        'pydep': 'python dependency update'
+        'pipfu': 'pipfile update'
         'WR': 'WebRender standalone'
         'Wgpu': 'WebGPU standalone'
         'Gd': 'Geckodriver'

diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml
@@ -236,7 +236,7 @@ jobs:
         definition: partner-repack
     periodic-updates:
         symbol: I(file)
-    python-dependency-updates:
+    pipfile-updates:
         symbol: I(pip)
     firefox-snap:
         symbol: I(snap)

diff --git a/...ter/ci/python-dependency-updates/kind.yml → taskcluster/ci/pipfile-update/kind.yml b/...ter/ci/python-dependency-updates/kind.yml → taskcluster/ci/pipfile-update/kind.yml
@@ -5,13 +5,13 @@
 loader: taskgraph.loader.transform:loader
 
 transforms:
-    - taskgraph.transforms.python_update:transforms
+    - taskgraph.transforms.pipfile_update:transforms
     - taskgraph.transforms.task:transforms
 
 
 job-defaults:
-    name: python_dependency_update
-    description: Update requirements.txt
+    name: pipfile_update
+    description: Update Pipfile.lock
     run-on-projects: []
     treeherder:
         kind: build
@@ -21,14 +21,14 @@ job-defaults:
     worker:
         implementation: docker-worker
         os: linux
-        docker-image: {in-tree: python-dependency-update}
+        docker-image: {in-tree: pipfile-updates}
         taskcluster-proxy: true
         max-run-time: 2400
         command:
             - /runme.sh
         artifacts:
-            - name: 'public/build/requirements.txt.diff'
-              path: '/home/worker/artifacts/requirements.txt.diff'
+            - name: 'public/build/Pipfile.lock.diff'
+              path: '/home/worker/artifacts/Pipfile.lock.diff'
               type: file
     scopes:
         - secrets:get:project/releng/gecko/build/level-{level}/arc-phabricator-token
@@ -37,9 +37,9 @@ job-defaults:
 jobs:
     funsize-update-generator:
         treeherder:
-            symbol: pydep(fug)
+            symbol: pipfu(fug)
         worker:
             env:
-                REQUIREMENTS_FILE: "taskcluster/docker/funsize-update-generator/requirements.in"
+                PIPFILE_DIRECTORY: "taskcluster/docker/funsize-update-generator"
                 PYTHON3: "1"
                 REVIEWERS: "sfraser, bhearsum"
diff --git a/taskcluster/docker/funsize-update-generator/Dockerfile b/taskcluster/docker/funsize-update-generator/Dockerfile
@@ -7,22 +7,12 @@ ENV DEBIAN_FRONTEND noninteractive
 # to make sure that files are removed within a single docker layer
 RUN apt-get update -q && \
     apt-get install -yyq --no-install-recommends \
-    bzip2 \
-    ca-certificates \
-    curl \
-    gcc \
-    jq \
-    libdpkg-perl \
-    libgetopt-simple-perl \
-    liblzma-dev \
-    locales \
-    python3.8 \
-    libpython3.8-dev \
-    python3-dev \
-    xz-utils \
-    && apt-get clean
+    python3.8 libpython3.8-dev python3-setuptools python3-cryptography libgetopt-simple-perl \
+    bzip2 python3-requests python3-sh curl \
+    python3-dev gcc liblzma-dev xz-utils jq libdpkg-perl locales && \
+    apt-get clean
 RUN useradd -d /home/worker -s /bin/bash -m worker
-COPY requirements.txt /
+COPY Pipfile Pipfile.lock /
 
 RUN locale-gen en_CA.UTF-8
 ENV LANG en_CA.UTF-8
@@ -33,8 +23,7 @@ ENV LC_ALL en_CA.UTF-8
 # python-pip installs a lot of dependencies increasing the size of an image
 # drastically. Install it like this saves us almost 200M.
 RUN bash -c "curl -L https://bootstrap.pypa.io/get-pip.py | python3.8"
-
-RUN ["pip", "install", "-r", "/requirements.txt"]
+RUN ["pip", "install", "pipenv"]
 
 # scripts
 RUN mkdir /home/worker/bin
@@ -50,6 +39,7 @@ ENV           SHELL         /bin/bash
 ENV           USER          worker
 ENV           LOGNAME       worker
 
-USER worker
+# This is done after setting environment variables to make sure the virtualenv is created in the right place.
+RUN pipenv install
 
 CMD ["/runme.sh"]
diff --git a/taskcluster/docker/funsize-update-generator/Pipfile b/taskcluster/docker/funsize-update-generator/Pipfile
@@ -0,0 +1,11 @@
+[requires]
+python_version = '3.8'
+
+[packages]
+aiohttp = "*"
+mar = "*"
+redo = "*"
+requests = "*"
+scriptworker = "*"
+sh = "*"
+awscli = "*"