templates/layout: Refine piwik script inclusion test
ClosedPublic
Actions

Authored by anlambert on Sep 8 2021, 3:27 PM.

Details

Reviewers

vlorentz

Group Reviewers

Reviewers

Commits

rDWAPPS45583024a8f7: templates/layout: Refine piwik script inclusion check

Summary

Piwik script should only be included in production website but testing
on the value of the DJANGO_SETTINGS_MODULE variable is not reliable
enough (swh-web in docker uses Django production settings for instance).

Diff Detail

Repository

rDWAPPS Web applications

Branch

piwik-production-only

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 23474
Build 36625: Phabricator diff pipeline on jenkins	Jenkins console · Jenkins
Build 36624: arc lint + arc unit

Event Timeline

anlambert created this revision.Sep 8 2021, 3:27 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptSep 8 2021, 3:27 PM

Build is green

Patch application report for D6213 (id=22485)

Rebasing onto b5ed695540...

Current branch diff-target is up to date.

Changes applied before test

commit 4ee6088e933e0b8e06819c7483c5298698503010
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Sep 8 15:26:42 2021 +0200

    templates/layout: Refine piwik script inclusion test
    
    Piwik script should only be included in production website but testing
    on the value of the DJANGO_SETTINGS_MODULE variable is not reliable
    enough (swh-web in docker uses Django production settings for instance).

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1092/ for more details.

Harbormaster completed remote builds in B23435: Diff 22485.Sep 8 2021, 3:41 PM

anlambert requested review of this revision.Sep 8 2021, 3:41 PM

Can you replace "test" with either "check" or "conditional" in your commit msg? it sounds like you changed pytest/cypress code.

This revision is now accepted and ready to land.Sep 9 2021, 2:42 PM

Rebase and reword commit message

This revision was landed with ongoing or failed builds.Sep 9 2021, 3:03 PM

Closed by commit rDWAPPS45583024a8f7: templates/layout: Refine piwik script inclusion check (authored by anlambert). · Explain Why

This revision was automatically updated to reflect the committed changes.

anlambert added a commit: rDWAPPS45583024a8f7: templates/layout: Refine piwik script inclusion check.

Build is green

Patch application report for D6213 (id=22528)

Rebasing onto 237cff07ff...

Current branch diff-target is up to date.

Changes applied before test

commit 45583024a8f7bf762558cf3ce13282dd55da6f86
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Wed Sep 8 15:26:42 2021 +0200

    templates/layout: Refine piwik script inclusion check
    
    Piwik script should only be included in production website but checking
    the value of the DJANGO_SETTINGS_MODULE variable is not reliable enough
    (swh-web in docker uses Django production settings for instance).

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/1102/ for more details.

Harbormaster completed remote builds in B23474: Diff 22528.Sep 9 2021, 3:08 PM