Merge pull request #249 from mozilla-iam/fix_ci

Fix ci - and attempt to deploy dev

.travis.yml

@@ -2,4 +2,4 @@ language: python
 python:
   - 3.6
 script:
-  - python -m unittest discover tests
+  - make test

Makefile

@@ -0,0 +1,11 @@
+ROOT_DIR	:= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+S3_BUCKET	:= ${S3_BUCKET}
+
+.PHONY: test
+test:
+	pip install pyyaml
+	python -m unittest discover tests
+
+.PHONY: deploy
+deploy: test
+	aws s3 sync . s3://$(S3_BUCKET)

README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/mozilla-iam/sso-dashboard-configuration.svg?branch=master)](https://travis-ci.org/mozilla-iam/sso-dashboard-configuration)
 
+![Codebuild Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUWVHQlJNT2FjckNEcUFtUzI4VVR3ZlBTYjRCYnl4SWhWcUx0TTFEMUMzWmFMM3N2eGdLOFJMTUl6NkNtQTFkRVdXa2RzSEQ5SGYvZWRZMW01Q2cvcXhRPSIsIml2UGFyYW1ldGVyU3BlYyI6IjZjWmVyRWdkRDFFVTllRksiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
+
 # How it works...
 
 `apps.yml` is used both for first stage access control and SSO Dashboard visibility settings.

buildspec.yml

@@ -9,7 +9,7 @@ phases:
       - echo Nothing to do in the pre_build phase...
   build:
     commands:
-      - aws s3 sync . s3://$S3_BUCKET
+      - ./deploy.sh
   post_build:
     commands:
       - echo Build completed on `date`

deploy.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+echo "Begin deploy of the apps.yml file."
+echo "$CODEBUILD_WEBHOOK_TRIGGER"
+
+if [[ "branch/master" == "$CODEBUILD_WEBHOOK_TRIGGER" ]]
+	then
+		echo "Deploying to the development CDN cdn.sso.allizom.org"
+        make deploy S3_BUCKET=sso-dashboard.configuration
+elif [[ "$CODEBUILD_WEBHOOK_TRIGGER" =~ ^tag\/[0-9]\.[0-9]\.[0-9](\-(prod))?$ ]]
+	then
+		echo "Deploying to the production CDN cdn.sso.mozilla.com"
+        make deploy S3_BUCKET=sso-dashboard.configuration-prod
+fi
+
+echo "$CODEBUILD_WEBHOOK_TRIGGER"
+echo "End deploy of the apps.yml."