From 83688cc56c95f5c342e0155a53349cd2cdb8e04c Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 16 Jun 2022 12:21:06 +0200 Subject: [PATCH] pipeline(mse-rgaa): correction installation/execution pa11y Voir https://forge.cadoles.com/CNOUS/mse/issues/664 --- pipelines/mse-rgaa.jenkinsfile | 14 +++++++++++--- resources/com/cadoles/pa11y/Dockerfile | 2 +- resources/com/cadoles/pa11y/run-audit.sh | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pipelines/mse-rgaa.jenkinsfile b/pipelines/mse-rgaa.jenkinsfile index 04cf57d..94dc0d0 100644 --- a/pipelines/mse-rgaa.jenkinsfile +++ b/pipelines/mse-rgaa.jenkinsfile @@ -18,7 +18,7 @@ pipeline { agent { node { - label "mse" + label "docker" } } @@ -48,7 +48,7 @@ pipeline { junit "*.xml" rocketSend ( - channel: "#cnous-mse-dev", + channel: "#cnous-mse", avatar: 'https://jenkins.cadol.es/static/b5f67753/images/headshot.png', message: """ Audit RGAA | ${testStatuses()} @@ -65,6 +65,14 @@ pipeline { } } + post { + always { + cleanWs() + } + } + + + } @NonCPS @@ -79,4 +87,4 @@ def testStatuses() { testStatus = "Passant(s): ${passed}, Échoué(s): ${failed} ${testResultAction.failureDiffString}, Désactivé(s): ${skipped}" } return testStatus -} +} \ No newline at end of file diff --git a/resources/com/cadoles/pa11y/Dockerfile b/resources/com/cadoles/pa11y/Dockerfile index 24ab7fb..4aa90e6 100644 --- a/resources/com/cadoles/pa11y/Dockerfile +++ b/resources/com/cadoles/pa11y/Dockerfile @@ -35,7 +35,7 @@ RUN apk add --no-cache \ chromium \ bash -RUN PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 npm install -g pa11y pa11y-reporter-html@^1.0.0 pa11y-reporter-junit +RUN PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 npm install -g pa11y@^5.0.0 pa11y-reporter-html@^1.0.0 pa11y-reporter-junit RUN adduser -D pa11y diff --git a/resources/com/cadoles/pa11y/run-audit.sh b/resources/com/cadoles/pa11y/run-audit.sh index ea3f95c..1784545 100644 --- a/resources/com/cadoles/pa11y/run-audit.sh +++ b/resources/com/cadoles/pa11y/run-audit.sh @@ -9,6 +9,7 @@ cd reports export PUPPETEER_EXECUTABLE_PATH=$(which chromium-browser) export PA11Y_REPORTER="${PA11Y_REPORTER:-html}" +export PA11Y_STANDARD=${PA11Y_STANDARD:-WCAG2AA} PA11Y_ARGS=""