From 8ba5a59acfc8872e6c522a7094866457deb7323b Mon Sep 17 00:00:00 2001
From: Aaron Ogata <aogata@instructure.com>
Date: Thu, 11 Mar 2021 10:14:58 -0800
Subject: [PATCH] allow ENABLE_AXE_SELENIUM to be used as env var

refs DE-560

[skip-rebase]

Change-Id: Ida5d5433d477ab092468a81cbaf0cbb419cfd0a0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/260547
Reviewed-by: James Butters <jbutters@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
---
 Jenkinsfile                                       | 15 +++++++++++++--
 .../new-jenkins/docker-compose-rspec-parallel.sh  |  2 +-
 build/new-jenkins/groovy/rspec.groovy             |  1 +
 spec/spec_helper.rb                               |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 31f92b6699b..f1aac9e62b5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -388,7 +388,14 @@ pipeline {
     stage('Environment') {
       steps {
         script {
-          if (configuration.skipCi() || (timedStage.isAllowStagesFilterUsed() && !env.JOB_NAME.endsWith('-allow-stages'))) {
+          if (
+            configuration.skipCi() ||
+            (
+              timedStage.isAllowStagesFilterUsed() &&
+              !env.JOB_NAME.endsWith('-allow-stages') &&
+              !env.JOB_NAME.endsWith('-axe')
+            )
+          ) {
             node('master') {
               def relevantFlag = configuration.skipCi() ? 'skip-ci' : 'allow-stages'
 
@@ -399,7 +406,11 @@ pipeline {
             }
           } else if(timedStage.isAllowStagesFilterUsed()) {
             node('master') {
-              gerrit.submitReview("", "Build Started\n\n$BUILD_URL")
+              if(env.JOB_NAME.endsWith('-axe')) {
+                gerrit.submitCodeReview("-2", "Verified status was not for the full build, -axe build was run.")
+              }
+
+              gerrit.submitVerified("0", "Build Started\n\n$BUILD_URL")
             }
           }
 
diff --git a/build/new-jenkins/docker-compose-rspec-parallel.sh b/build/new-jenkins/docker-compose-rspec-parallel.sh
index 392c6147ed4..42a16bef8cc 100755
--- a/build/new-jenkins/docker-compose-rspec-parallel.sh
+++ b/build/new-jenkins/docker-compose-rspec-parallel.sh
@@ -4,4 +4,4 @@ set -o errexit -o errtrace -o pipefail -o xtrace
 parallel --will-cite ::: :
 
 # Run each group of tests in separate docker container
-seq 0 $((DOCKER_PROCESSES-1)) | parallel -u "docker-compose --project-name canvas-lms{} exec -T -e RSPEC_PROCESSES canvas bash -c 'build/new-jenkins/rspec-with-retries.sh'"
+seq 0 $((DOCKER_PROCESSES-1)) | parallel -u "docker-compose --project-name canvas-lms{} exec -T -e RSPEC_PROCESSES -e ENABLE_AXE_SELENIUM canvas bash -c 'build/new-jenkins/rspec-with-retries.sh'"
diff --git a/build/new-jenkins/groovy/rspec.groovy b/build/new-jenkins/groovy/rspec.groovy
index 6c982961ca2..ce58a8d25b5 100644
--- a/build/new-jenkins/groovy/rspec.groovy
+++ b/build/new-jenkins/groovy/rspec.groovy
@@ -100,6 +100,7 @@ def _runRspecTestSuite(
       "POSTGRES_PASSWORD=sekret",
       "SELENIUM_VERSION=3.141.59-20201119",
       "PATCHSET_TAG=$patchsetTag",
+      "ENABLE_AXE_SELENIUM=${env.ENABLE_AXE_SELENIUM}",
   ]) {
     try {
       cleanAndSetup()
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3bf96bbd112..f14d2875348 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -138,7 +138,7 @@ module ActionView::TestCase::Behavior
   end
 end
 
-if ENV['ENABLE_AXE_SELENIUM']
+if ENV['ENABLE_AXE_SELENIUM'] == '1'
   require_relative './axe_selenium_helper'
   AxeSelenium.install!
 end