Unverified Commit d48784e6 authored by Gregory Mierzwinski's avatar Gregory Mierzwinski Committed by GitHub
Browse files

Bug 1627027 - Use nightly Fenix variant. (#10265) 

* Use nightly Fenix variant.

* Run the tests in PR.

* Update visual-metrics scripts to include the similarity metrics.

* Use python3.5 in visual-metrics docker.

* Install wget in the docker.

* Use python3.6 hashes instead of python3.5.

* Undo run-visual-metrics.py python changes.

* Upgrade python setuptools version to 46.1.3.

* Add setuptools to transitive dependency list.

* Undo PR test changes.

* Remove setuptools install line and use requirements.txt instead.

* Undo PR test changes.

* Fix geckodriver artifact suffix.

* Test a browsertime task.

* Revert browsertime test.
parent f63cb4e0

taskcluster/ci/browsertime/kind.yml

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ kind-dependencies: 
primary-dependency: signing



only-for-build-types:

    - performance-test

    - nightly



only-for-abis:

    - armeabi-v7a
@@ -81,7 +81,7 @@ job-defaults: 
            - '--app=fenix'

            - '--browsertime'

            - '--cold'

            - '--binary=org.mozilla.fenix.performancetest'

            - '--binary=org.mozilla.fenix.nightly'

            - '--activity=org.mozilla.fenix.IntentReceiverActivity'

            - '--download-symbols=ondemand'

            - '--browsertime-node=$MOZ_FETCHES_DIR/node/bin/node'

taskcluster/ci/raptor/kind.yml

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ kind-dependencies: 
    - toolchain



only-for-build-types:

    - performance-test

    - nightly



only-for-abis:

    - armeabi-v7a
@@ -76,7 +76,7 @@ job-defaults: 
            - './test-linux.sh'

            - '--cfg=mozharness/configs/raptor/android_hw_config.py'

            - '--app=fenix'

            - '--binary=org.mozilla.fenix.performancetest'

            - '--binary=org.mozilla.fenix.nightly'

            - '--activity=org.mozilla.fenix.IntentReceiverActivity'

            - '--download-symbols=ondemand'

    fetches:

taskcluster/ci/toolchain/gecko-derived.yml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ linux64-ffmpeg-4.1.4: 


linux64-geckodriver:

    attributes:

        toolchain-artifact: public/build/geckodriver.tar.xz

        toolchain-artifact: public/build/geckodriver.tar.gz

    description: "Geckodriver toolchain"

    run:

        index-search:

taskcluster/docker/visual-metrics/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ WORKDIR /builds/worker 
USER worker:worker



COPY requirements.txt /builds/worker/requirements.txt

RUN pip3 install setuptools==46.0.0

RUN pip3 install --require-hashes -r /builds/worker/requirements.txt && \

    rm /builds/worker/requirements.txt



COPY similarity.py /builds/worker/bin/similarity.py

COPY run-visual-metrics.py /builds/worker/bin/run-visual-metrics.py

COPY performance-artifact-schema.json /builds/worker/performance-artifact-schema.json

taskcluster/docker/visual-metrics/requirements.txt

+11 −1
Original line number Diff line number Diff line 
# Dependency hashes must be for python3.6



# Direct dependencies

attrs==19.1.0 --hash=sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79

structlog==19.1.0 --hash=sha256:db441b81c65b0f104a7ce5d86c5432be099956b98b8a2c8be0b3fb3a7a0b1536

voluptuous==0.11.5 --hash=sha256:303542b3fc07fb52ec3d7a1c614b329cdbee13a9d681935353d8ea56a7bfa9f1

jsonschema==3.2.0 --hash=sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163

numpy==1.18.3 --hash=sha256:a551d8cc267c634774830086da42e4ba157fa41dd3b93982bc9501b284b0c689

scipy==1.4.1 --hash=sha256:386086e2972ed2db17cebf88610aab7d7f6e2c0ca30042dc9a89cf18dcc363fa

matplotlib==3.0.3 --hash=sha256:e8d1939262aa6b36d0c51f50a50a43a04b9618d20db31e6c0192b1463067aeef

opencv-python==4.2.0.34 --hash=sha256:dcb8da8c5ebaa6360c8555547a4c7beb6cd983dd95ba895bb78b86cc8cf3de2b



# Transitive dependencies

importlib_metadata==1.1.0 --hash=sha256:e6ac600a142cf2db707b1998382cc7fc3b02befb7273876e01b8ad10b9652742

more_itertools==8.0.0 --hash=sha256:a0ea684c39bc4315ba7aae406596ef191fd84f873d2d2751f84d64e81a7a2d45

pyrsistent==0.15.6 --hash=sha256:f3b280d030afb652f79d67c5586157c5c1355c9a58dfc7940566e28d28f3df1b

setuptools==46.0.0 --hash=sha256:693e0504490ed8420522bf6bc3aa4b0da6a9f1c80c68acfb4e959275fd04cd82

six==1.12.0 --hash=sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c

zipp==0.6.0 --hash=sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335

cycler==0.10.0 --hash=sha256:1d8a5ae1ff6c5cf9b93e8811e581232ad8920aeec647c37316ceac982b08cb2d

kiwisolver==1.1.0 --hash=sha256:400599c0fe58d21522cae0e8b22318e09d9729451b17ee61ba8e1e7c0346565c

pyparsing==2.4.7 --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b

python-dateutil==2.8.1 --hash=sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a

setuptools==46.1.3 --hash=sha256:4fe404eec2738c20ab5841fa2d791902d2a645f32318a7850ef26f8d7215a8ee