diff --git a/jobs/deploy-webapp.groovy b/jobs/deploy-webapp.groovy index 152984b..1f54558 100644 --- a/jobs/deploy-webapp.groovy +++ b/jobs/deploy-webapp.groovy @@ -478,20 +478,6 @@ def _manualSmokeTestCheck(job){ } -def deployFastlyStaging() { - withTimeout('10m') { - withSecrets.slackAndStackdriverAlertlibOnly() { - exec(["make", "-C", "webapp/services/fastly-khanacademy-compute", - "deploy-staging", - "ALREADY_RAN_TESTS=1", - "DEPLOY_VERSION=${NEW_VERSION}"]); - exec(["make", "-C", "webapp/services/fastly-khanacademy-compute", - "set-default-staging", - "DEPLOY_VERSION=${NEW_VERSION}"]); - } - } -} - def verifySmokeTestResults(jobName, buildmasterFailures=0) { withTimeout('60m') { def status; @@ -950,16 +936,6 @@ onMaster('4h') { } try { - stage("Deploy fastly-staging if needed") { - // We only ever do this in this job, which applies to the - // first deploy in the queue exclusively (rather than in - // build-webapp.groovy, which happens in parallel to - // every(ish) deploy in the queue), since we only have one - // staging service in fastly. - if ('fastly-khanacademy-compute' in SERVICES) { - deployFastlyStaging(); - } - } stage("Await first smoke test") { // NOTE: the first-smoke-test run has been going on for a // while, and until now it will have hit old code in the