[Mesa-dev] Stable nomination updates
Hi everyone, As part of our stable CI process at Intel, we lock the version of piglit, deqp, and the Khronos CTSes at branchpoint. If you nominate a patch for stable and there is a corresponding change to one of those test suites, can you please mention it in the commit message? This is a huge help to us in verifying the stables releases. Dylan signature.asc Description: signature ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] How to merge Mesa changes which require corresponding piglit changes
Michel Dänzer writes: > On 2019-11-15 4:02 p.m., Mark Janes wrote: >> Michel Dänzer writes: >> >>> Now that the GitLab CI pipeline tests a snapshot of piglit with llvmpipe >>> (https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2468), the >>> question has come up how to deal with inter-dependent Mesa/piglit >>> changes (where merging only one or the other causes some piglit >>> regressions). >>> >>> >>> First of all, let it be clear that just merging the Mesa changes as-is >>> and breaking the GitLab CI pipeline is not acceptable. >>> >>> >>> From the Mesa POV, the easiest solution is: >>> >>> 1. Merge the piglit changes >>> 2. In the Mesa MR (merge request), add a commit which updates piglit[0] >>> 3. If the CI pipeline is green, the MR can be merged >>> >>> >>> In case one wants to avoid alarms from external CI systems, another >>> possibility is: >> >> For the Intel CI, no alarm is generated if the piglit test is pushed >> first. Normal development process includes writing a piglit test to >> illustrate the bug that is being fixed. > > Cool, but what if the piglit changes affect the results of existing > tests? That was the situation yesterday which prompted this thread. We attribute the status change to piglit in the CI config, within a few hours. The test shows up as a failure in CI until it is triaged. >>> 1. In the Mesa MR, add a commit which disables the piglit tests broken >>> by the Mesa changes. >>> 2. If the CI pipeline is green, the MR can be merged >>> 3. Merge the piglit changes >>> 4. Create another Mesa MR which updates piglit[0] and re-enables the >>> tests disabled in step 1 >>> >>> I hope that covers it, don't hesitate to ask questions if something's >>> still unclear. >> >> It might help developers if CI generated the patch to make their pipeline >> pass. > > It does for the test result list, if that's what you mean. > > However, that patch shouldn't be applied mechanically, but only after > confirming that all changes in test results are expected. Ideally, > whenever there are any new tests, the corresponding CI jobs should be > run several times to make sure the new results are stable, otherwise any > flaky tests should be excluded. > > > -- > Earthling Michel Dänzer | https://redhat.com > Libre software enthusiast | Mesa and X developer ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] How to merge Mesa changes which require corresponding piglit changes
On 2019-11-15 4:02 p.m., Mark Janes wrote: > Michel Dänzer writes: > >> Now that the GitLab CI pipeline tests a snapshot of piglit with llvmpipe >> (https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2468), the >> question has come up how to deal with inter-dependent Mesa/piglit >> changes (where merging only one or the other causes some piglit >> regressions). >> >> >> First of all, let it be clear that just merging the Mesa changes as-is >> and breaking the GitLab CI pipeline is not acceptable. >> >> >> From the Mesa POV, the easiest solution is: >> >> 1. Merge the piglit changes >> 2. In the Mesa MR (merge request), add a commit which updates piglit[0] >> 3. If the CI pipeline is green, the MR can be merged >> >> >> In case one wants to avoid alarms from external CI systems, another >> possibility is: > > For the Intel CI, no alarm is generated if the piglit test is pushed > first. Normal development process includes writing a piglit test to > illustrate the bug that is being fixed. Cool, but what if the piglit changes affect the results of existing tests? That was the situation yesterday which prompted this thread. >> 1. In the Mesa MR, add a commit which disables the piglit tests broken >> by the Mesa changes. >> 2. If the CI pipeline is green, the MR can be merged >> 3. Merge the piglit changes >> 4. Create another Mesa MR which updates piglit[0] and re-enables the >> tests disabled in step 1 >> >> I hope that covers it, don't hesitate to ask questions if something's >> still unclear. > > It might help developers if CI generated the patch to make their pipeline > pass. It does for the test result list, if that's what you mean. However, that patch shouldn't be applied mechanically, but only after confirming that all changes in test results are expected. Ideally, whenever there are any new tests, the corresponding CI jobs should be run several times to make sure the new results are stable, otherwise any flaky tests should be excluded. -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] How to merge Mesa changes which require corresponding piglit changes
Michel Dänzer writes: > Now that the GitLab CI pipeline tests a snapshot of piglit with llvmpipe > (https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2468), the > question has come up how to deal with inter-dependent Mesa/piglit > changes (where merging only one or the other causes some piglit > regressions). > > > First of all, let it be clear that just merging the Mesa changes as-is > and breaking the GitLab CI pipeline is not acceptable. > > > From the Mesa POV, the easiest solution is: > > 1. Merge the piglit changes > 2. In the Mesa MR (merge request), add a commit which updates piglit[0] > 3. If the CI pipeline is green, the MR can be merged > > > In case one wants to avoid alarms from external CI systems, another > possibility is: For the Intel CI, no alarm is generated if the piglit test is pushed first. Normal development process includes writing a piglit test to illustrate the bug that is being fixed. > 1. In the Mesa MR, add a commit which disables the piglit tests broken > by the Mesa changes. > 2. If the CI pipeline is green, the MR can be merged > 3. Merge the piglit changes > 4. Create another Mesa MR which updates piglit[0] and re-enables the > tests disabled in step 1 > > I hope that covers it, don't hesitate to ask questions if something's > still unclear. It might help developers if CI generated the patch to make their pipeline pass. > [0] How to update piglit in the CI pipeline: > > * Change the commit hash on the "git checkout" line in > .gitlab-ci/debian-test-install.sh[1] to a later commit from the piglit > master branch > * Bump DEBIAN_TEST_TAG[1] in .gitlab-ci.yml to the current date > * May also need to update .gitlab-ci/piglit/*.txt to match any expected > changes in test results > > See https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2748 for an > example. > > > [1] Might soon be .gitlab-ci/container/x86_test.sh and DEBIAN_TAG in the > x86_test job definition, respectively, once > https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2722 is merged. > > > -- > Earthling Michel Dänzer | https://redhat.com > Libre software enthusiast | Mesa and X developer > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] How to merge Mesa changes which require corresponding piglit changes
Now that the GitLab CI pipeline tests a snapshot of piglit with llvmpipe (https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2468), the question has come up how to deal with inter-dependent Mesa/piglit changes (where merging only one or the other causes some piglit regressions). First of all, let it be clear that just merging the Mesa changes as-is and breaking the GitLab CI pipeline is not acceptable. From the Mesa POV, the easiest solution is: 1. Merge the piglit changes 2. In the Mesa MR (merge request), add a commit which updates piglit[0] 3. If the CI pipeline is green, the MR can be merged In case one wants to avoid alarms from external CI systems, another possibility is: 1. In the Mesa MR, add a commit which disables the piglit tests broken by the Mesa changes. 2. If the CI pipeline is green, the MR can be merged 3. Merge the piglit changes 4. Create another Mesa MR which updates piglit[0] and re-enables the tests disabled in step 1 I hope that covers it, don't hesitate to ask questions if something's still unclear. [0] How to update piglit in the CI pipeline: * Change the commit hash on the "git checkout" line in .gitlab-ci/debian-test-install.sh[1] to a later commit from the piglit master branch * Bump DEBIAN_TEST_TAG[1] in .gitlab-ci.yml to the current date * May also need to update .gitlab-ci/piglit/*.txt to match any expected changes in test results See https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2748 for an example. [1] Might soon be .gitlab-ci/container/x86_test.sh and DEBIAN_TAG in the x86_test job definition, respectively, once https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2722 is merged. -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
