ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Aaron Ogata 2021-03-11 10:14:58 -08:00
parent 24b7244c11
commit 8ba5a59acf
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Jenkinsfile vendored
View File

@ -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")
}
}

2
build/new-jenkins/docker-compose-rspec-parallel.sh
View File

@ -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'"

1
build/new-jenkins/groovy/rspec.groovy
View File

@ -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()

2
spec/spec_helper.rb
View File

@ -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