Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not try to deploy to fastly-staging in deploy-webapp.groovy. #234

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions jobs/deploy-webapp.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down