From 16578b0af0068fa5b08c4b7a3c6491a96bfe4292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@grafana.com>
Date: Mon, 15 Nov 2021 08:49:39 +0100
Subject: [PATCH] Chore: Fix broken pa11y-ci (#41597)

* Chore: Fix broken pa11y-ci

* Chore: using npx instead

* Chore: testing with prebuilt image

* Chore: testing bin path

* Chore: trying

* Chore: another try

* Update puppeteer image

* Chore: updating image

* Chore: removes yarn version printout

* Chore: removes yarn version printout

Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
---
 .drone.yml                      | 12 +++++-------
 scripts/drone/steps/lib.star    |  6 +++---
 scripts/generate-a11y-report.sh |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 3cc077abbcc..95d7a4434ef 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -212,8 +212,7 @@ steps:
   name: build-storybook
 - commands:
   - yarn wait-on http://$HOST:$PORT
-  - yarn dlx pa11y-ci@git://github.com/pa11y/pa11y-ci#5c842cf1b9fe2867b70ff5354851d985be8d71c4
-    pa11y-ci --config .pa11yci-pr.conf.js
+  - pa11y-ci --config .pa11yci-pr.conf.js
   depends_on:
   - end-to-end-tests-server
   environment:
@@ -222,7 +221,7 @@ steps:
     HOST: end-to-end-tests-server
     PORT: 3001
   failure: ignore
-  image: buildkite/puppeteer
+  image: hugohaggmark/docker-puppeteer
   name: test-a11y-frontend
 - commands:
   - ./scripts/ci-reference-docs-lint.sh ci
@@ -507,8 +506,7 @@ steps:
   name: publish-storybook
 - commands:
   - yarn wait-on http://$HOST:$PORT
-  - yarn dlx --quiet pa11y-ci@git://github.com/pa11y/pa11y-ci#5c842cf1b9fe2867b70ff5354851d985be8d71c4
-    pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json
+  - pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json
   depends_on:
   - end-to-end-tests-server
   environment:
@@ -517,7 +515,7 @@ steps:
     HOST: end-to-end-tests-server
     PORT: 3001
   failure: ignore
-  image: buildkite/puppeteer
+  image: hugohaggmark/docker-puppeteer
   name: test-a11y-frontend
 - commands:
   - ./scripts/ci-frontend-metrics.sh | ./bin/grabpl publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
@@ -3432,6 +3430,6 @@ kind: secret
 name: drone_token
 ---
 kind: signature
-hmac: 612011aafafad61d355de61b10daaffd947817161667385a216cb82d8c2a7b1d
+hmac: d2db1d71a52922f66df9d327cb8991944d6fd050b4ad4d36e5f7cfb9f79f9297
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 1d8d040ed52..deda4f4c3ea 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -428,16 +428,16 @@ def test_a11y_frontend_step(ver_mode, edition, port=3001):
     ]
     if ver_mode == 'pr':
         commands.extend([
-            'yarn dlx pa11y-ci@git://github.com/pa11y/pa11y-ci#5c842cf1b9fe2867b70ff5354851d985be8d71c4 pa11y-ci --config .pa11yci-pr.conf.js',
+            'pa11y-ci --config .pa11yci-pr.conf.js',
         ])
     else:
         commands.extend([
-            'yarn dlx --quiet pa11y-ci@git://github.com/pa11y/pa11y-ci#5c842cf1b9fe2867b70ff5354851d985be8d71c4 pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json',
+            'pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json',
         ])
 
     return {
         'name': 'test-a11y-frontend' + enterprise2_suffix(edition),
-        'image': 'buildkite/puppeteer',
+        'image': 'hugohaggmark/docker-puppeteer',
         'depends_on': [
           'end-to-end-tests-server' + enterprise2_suffix(edition),
         ],
diff --git a/scripts/generate-a11y-report.sh b/scripts/generate-a11y-report.sh
index 49079deadf7..929810062ac 100755
--- a/scripts/generate-a11y-report.sh
+++ b/scripts/generate-a11y-report.sh
@@ -27,7 +27,7 @@ else
 fi
 
 # Run accessibility command
-yarn dlx --quiet pa11y-ci@git://github.com/pa11y/pa11y-ci#5c842cf1b9fe2867b70ff5354851d985be8d71c4 --config .pa11yci.conf.js --json > pa11y-ci-results.json
+yarn dlx --quiet pa11y-ci@pa11y/pa11y-ci#5c842cf1b9fe2867b70ff5354851d985be8d71c4 --config .pa11yci.conf.js --json > pa11y-ci-results.json
 
 # Generate HTML report
 yarn dlx pa11y-ci-reporter-html@3.0.1 pa11y-ci-reporter-html