Revert "Generate new Crystalball map if spec files added/deleted"
This reverts commit e0841f7caa
.
Reason for revert: broke Jenkins
Change-Id: I6c6b74582096b9877fa71ee3733d11bf27217b2b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/286901
Tested-by: Aaron Ogata <aogata@instructure.com>
Reviewed-by: Aaron Ogata <aogata@instructure.com>
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Reviewed-by: Alex Slaughter <aslaughter@instructure.com>
QA-Review: Aaron Ogata <aogata@instructure.com>
Product-Review: Aaron Ogata <aogata@instructure.com>
This commit is contained in:
parent
e0841f7caa
commit
18e78b3c2a
|
@ -585,11 +585,6 @@ pipeline {
|
|||
string(name: 'POSTGRES_IMAGE_TAG', value: "${env.POSTGRES_IMAGE_TAG}"),
|
||||
])
|
||||
|
||||
// Trigger Crystalball map build if spec files were added or removed, will not vote on builds.
|
||||
if (configuration.isChangeMerged() && filesChangedStage.hasNewDeletedSpecFiles(buildConfig)) {
|
||||
build(wait: false, job: 'Canvas/proofs-of-concept/crystalball-map')
|
||||
}
|
||||
|
||||
extendedStage('Flakey Spec Catcher')
|
||||
.hooks(buildSummaryReportHooks.call())
|
||||
.required(!configuration.isChangeMerged() && filesChangedStage.hasSpecFiles(buildConfig) || configuration.forceFailureFSC() == '1')
|
||||
|
|
|
@ -44,10 +44,6 @@ def hasYarnFiles(buildConfig) {
|
|||
return buildConfig[STAGE_NAME].value('yarnFiles')
|
||||
}
|
||||
|
||||
def hasNewDeletedSpecFiles(buildConfig) {
|
||||
return buildConfig[STAGE_NAME].value('addedOrDeletedSpecFiles')
|
||||
}
|
||||
|
||||
def call(stageConfig) {
|
||||
def dockerDevFiles = [
|
||||
'^docker-compose/',
|
||||
|
@ -64,7 +60,6 @@ def call(stageConfig) {
|
|||
stageConfig.value('groovyFiles', git.changedFiles(['.*.groovy', 'Jenkinsfile.*'], 'HEAD^'))
|
||||
stageConfig.value('yarnFiles', git.changedFiles(['package.json', 'yarn.lock'], 'HEAD^'))
|
||||
stageConfig.value('migrationFiles', sh(script: 'build/new-jenkins/check-for-migrations.sh', returnStatus: true) == 0)
|
||||
stageConfig.value('addedOrDeletedSpecFiles', sh(script: 'git diff --name-only --diff-filter=AD HEAD^..HEAD | grep "_spec.rb"', returnStatus: true) == 0)
|
||||
|
||||
dir(env.LOCAL_WORKDIR) {
|
||||
stageConfig.value('specFiles', sh(script: "${WORKSPACE}/build/new-jenkins/spec-changes.sh", returnStatus: true) == 0)
|
||||
|
|
Loading…
Reference in New Issue