Cleanup new deploy, shared skip_files, fixes for prod

app.yaml

@@ -1,5 +1,3 @@
-application: cr-status
-version: schedule-emailer
 runtime: python27
 threadsafe: true
 api_version: 1
@@ -9,17 +7,6 @@ api_version: 1
 builtins:
 - remote_api: on
 
-#libraries:
-#- name: webapp2
-#  version: "latest"
-#- name: django
-#  version: "1.4" #"1.9"
-# - name: setuptools
-#   version: latest
-
-#env_variables:
-#  DJANGO_SETTINGS_MODULE: 'settings'
-
 handlers:
 
 # Static handlers ---------------------------------------------------------------
@@ -96,26 +83,5 @@ handlers:
   script: server.app
   secure: always
 
-skip_files:
-- ^(.*/)?app\.yaml
-- ^(.*/)?app\.yml
-- ^(.*/)?index\.yaml
-- ^(.*/)?index\.yml
-- ^(.*/)?#.*#
-- ^(.*/)?.*~
-- ^(.*/)?.*\.py[co]
-- ^(.*/)?.*/RCS/.*
-- ^(.*/)?\..*
-- ^(.*/)?.*\.csv$
-- ^(.*/)?.*\.psd$
-- ^(.*/)?.*\.sql[3]$
-- ^(.*/)?.*\.sh$
-- ^(.*/)?.*\.scss$
-- ^(.*/)?node_modules
-- ^(.*/)?tests
-- ^(.*/)?.[LICENSE|PATENTS|AUTHORS|CONTRIBUTING|COPYING](\.md)?
-- ^(.*/)?.*\.md$
-
-- ^http2push/example
-- ^http2push/site
-- ^static/sass
+includes:
+- skip_files.yaml

models.py

@@ -741,7 +741,7 @@ class Feature(DictModel):
       'is_update': is_update,
       'feature': self.format_for_template()
     })
-    queue = taskqueue.Queue(name='emailer')
+    queue = taskqueue.Queue()#name='emailer')
     # Create task to email owners.
     task = taskqueue.Task(method="POST", url='/tasks/email-owners',
         target='notifier', payload=payload)

notifier.py

@@ -36,7 +36,7 @@ def email_feature_owners(feature, is_update=False, changes=[]):
 
     owner_names = [owner.name for owner in component.owners]
     if not owner_names:
-      logging.info('Blink component has no owners. Skipping email')
+      logging.info('Blink component %s has no owners. Skipping email.' % component_name)
       return
 
     if feature.shipped_milestone:

notifier.yaml

@@ -1,9 +1,12 @@
 runtime: python27
 api_version: 1
 threadsafe: true
-service: notifier
+module: notifier
 
 handlers:
 - url: /.*
   script: notifier.app
   login: admin
+
+includes:
+- skip_files.yaml

queue.yaml

@@ -1,6 +1,5 @@
-# total_storage_limit: 120M
 queue:
-- name: emailer
+- name: default
   target: notifier
   rate: 1/s
   retry_parameters:
@@ -8,3 +7,4 @@ queue:
     task_age_limit: 2d
   # bucket_size: 40
   # max_concurrent_requests: 10
+# total_storage_limit: 120M

scripts/deploy_site.sh

@@ -8,6 +8,16 @@
 # Copyright 2015 Eric Bidelman <ericbidelman@chromium.org>
 
 
+deployVersion=$1
+usage="Usage: deploy.sh `date +%Y-%m-%d`"
+
+if [ -z "$deployVersion" ]
+then
+  echo "App version not specified."
+  echo $usage
+  exit 0
+fi
+
 # The directory in which this script resides.
 readonly BASEDIR=$(dirname $BASH_SOURCE)
 
@@ -16,4 +26,4 @@ readonly BASEDIR=$(dirname $BASH_SOURCE)
 gulp
 
 $BASEDIR/oauthtoken.sh deploy
-appcfg.py update -A cr-status $BASEDIR/../app.yaml $BASEDIR/../notifier.yaml
+appcfg.py update -A cr-status -V $deployVersion $BASEDIR/../app.yaml $BASEDIR/../notifier.yaml

skip_files.yaml

@@ -0,0 +1,23 @@
+skip_files:
+- ^(.*/)?app\.yaml
+- ^(.*/)?app\.yml
+- ^(.*/)?index\.yaml
+- ^(.*/)?index\.yml
+- ^(.*/)?#.*#
+- ^(.*/)?.*~
+- ^(.*/)?.*\.py[co]
+- ^(.*/)?.*/RCS/.*
+- ^(.*/)?\..*
+- ^(.*/)?.*\.csv$
+- ^(.*/)?.*\.psd$
+- ^(.*/)?.*\.sql[3]$
+- ^(.*/)?.*\.sh$
+- ^(.*/)?.*\.scss$
+- ^(.*/)?node_modules
+- ^(.*/)?tests
+- ^(.*/)?.[LICENSE|PATENTS|AUTHORS|CONTRIBUTING|COPYING](\.md)?
+- ^(.*/)?.*\.md$
+
+- ^http2push/example
+- ^http2push/site
+- ^static/sass

templates/samples.html

@@ -262,7 +262,7 @@ var samplesPromise = new Promise(function(resolve, reject) {
 samplesPromise.then(function(features) {
   var re = /github.com\/GoogleChrome\/samples\/tree\/gh-pages\/(.*)/i;
   features.forEach(function(f, i) {
-    f.sample_links = f.sample_links.map(function(link) {
+    f.sample_links = f.resources.samples.map(function(link) {
       return link.replace(re, 'googlechrome.github.io/samples/$1');
     });
   });