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

remove docker_base podTemplate usage, cleanup nodeRequirements usage 

refs DE-718

test plan:
  - EC2 builds continue to work as expected

Change-Id: Ibed627a4e1d4b1e40520036df2b8a4e1d29d5fcc
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/267159
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Kyle Rosenbaum <krosenbaum@instructure.com>
Product-Review: Kyle Rosenbaum <krosenbaum@instructure.com>
This commit is contained in:
Kyle Rosenbaum 2021-06-15 09:57:52 -07:00
parent c205b28e93
commit 5677d7531d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile.selenium.flakey_spec_catcher
View File

@ -215,7 +215,7 @@ pipeline {
stage('Environment') { stage('Environment') {
steps { steps {
script { script {
extendedStage('Runner').nodeRequirements(label: 'canvas-docker', podTemplate: libraryResource('/pod_templates/docker_base.yml'), container: 'docker').obeysAllowStages(false).execute { extendedStage('Runner').nodeRequirements(label: 'canvas-docker').obeysAllowStages(false).execute {
def postBuildHandler = [ def postBuildHandler = [
onStageEnded: { stageName, stageConfig -> onStageEnded: { stageName, stageConfig ->
cleanupFn(stageConfig.status()) cleanupFn(stageConfig.status())

2
Jenkinsfile.vendored-gems
View File

@ -44,7 +44,7 @@ pipeline {
onNodeAcquired: vendoredGemsStage.setupNode(), onNodeAcquired: vendoredGemsStage.setupNode(),
] ]
extendedStage('Runner').hooks(stageHooks).nodeRequirements(label: 'canvas-docker', podTemplate: libraryResource('/pod_templates/docker_base.yml'), container: 'docker').obeysAllowStages(false).execute { extendedStage('Runner').hooks(stageHooks).nodeRequirements(label: 'canvas-docker').obeysAllowStages(false).execute {
extendedStage('Vendored Gems').obeysAllowStages(false).timeout(10).execute { extendedStage('Vendored Gems').obeysAllowStages(false).timeout(10).execute {
sh 'build/new-jenkins/test-gems.sh' sh 'build/new-jenkins/test-gems.sh'
} }

6
build/new-jenkins/library/vars/rspecStage.groovy
View File

@ -47,11 +47,13 @@ def createDistribution(nestedStages) {
'TEST_PATTERN=^./(spec|gems/plugins/.*/spec_canvas)/selenium', 'TEST_PATTERN=^./(spec|gems/plugins/.*/spec_canvas)/selenium',
] ]
def rspecNodeRequirements = [label: 'canvas-docker']
rspecNodeTotal.times { index -> rspecNodeTotal.times { index ->
extendedStage("RSpec Test Set ${(index + 1).toString().padLeft(2, '0')}") extendedStage("RSpec Test Set ${(index + 1).toString().padLeft(2, '0')}")
.envVars(rspecEnvVars + ["CI_NODE_INDEX=$index"]) .envVars(rspecEnvVars + ["CI_NODE_INDEX=$index"])
.hooks([onNodeAcquired: setupNodeHook, onNodeReleasing: { tearDownNode('rspec') }]) .hooks([onNodeAcquired: setupNodeHook, onNodeReleasing: { tearDownNode('rspec') }])
.nodeRequirements(label: 'canvas-docker', podTemplate: libraryResource('/pod_templates/docker_base.yml'), container: 'docker') .nodeRequirements(rspecNodeRequirements)
.timeout(15) .timeout(15)
.queue(nestedStages, this.&runSuite) .queue(nestedStages, this.&runSuite)
} }
@ -60,7 +62,7 @@ def createDistribution(nestedStages) {
extendedStage("Selenium Test Set ${(index + 1).toString().padLeft(2, '0')}") extendedStage("Selenium Test Set ${(index + 1).toString().padLeft(2, '0')}")
.envVars(seleniumEnvVars + ["CI_NODE_INDEX=$index"]) .envVars(seleniumEnvVars + ["CI_NODE_INDEX=$index"])
.hooks([onNodeAcquired: setupNodeHook, onNodeReleasing: { tearDownNode('selenium') }]) .hooks([onNodeAcquired: setupNodeHook, onNodeReleasing: { tearDownNode('selenium') }])
.nodeRequirements(label: 'canvas-docker', podTemplate: libraryResource('/pod_templates/docker_base.yml'), container: 'docker') .nodeRequirements(rspecNodeRequirements)
.timeout(15) .timeout(15)
.queue(nestedStages, this.&runSuite) .queue(nestedStages, this.&runSuite)
} }