Commit Graph

28 Commits

Author SHA1 Message Date
Ryan Shaw efb76cf2fb Upgrade yarn from 1.6.0 to 1.7.0
if you are having problems after this commit you need to either:
“brew upgrade yarn”
Or
“apt-get install yarn” 
Or 
Rebuild your docker container
Or do whatever else you use to manage software version

Change-Id: I8428112b4a44c28edd2608124bff9e01a8e960d9
Reviewed-on: https://gerrit.instructure.com/151423
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
QA-Review: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
2018-05-24 21:37:04 +00:00
Derek Bender 90e8bbe37a update bundler in Dockerfiles
Change-Id: Idec6cbfa21a4bf67cba5e879806f0f678c191f79
Reviewed-on: https://gerrit.instructure.com/147776
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
2018-04-23 20:47:34 +00:00
Derek Bender 11b30e7fea upgrade yarn to 1.6.0
Change-Id: Icc59c9c43fea079196d9a0dc29b23ac0f1da74c7
Reviewed-on: https://gerrit.instructure.com/147047
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
2018-04-19 20:31:06 +00:00
Cody Cutrer e67fb3d3e4 use Erubi, not Erubis
Change-Id: I22efdd20563c11e98284083e7e99cbed45ef22ed
Reviewed-on: https://gerrit.instructure.com/146527
Tested-by: Jenkins
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-04-11 22:48:10 +00:00
Simon Williams b85022d087 run all predeploys before postdeploys in tests [ci no-db-snapshot]
Change-Id: I6769b05e6e4440793424171ee5b4e3171c5cf40a
Reviewed-on: https://gerrit.instructure.com/145870
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Tested-by: Jenkins
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2018-04-05 15:27:10 +00:00
Clay Diffrient 497fe4d5ea Update to yarn 1.5.1
closes GH-1250

Test Plan:
  - Everything builds

Change-Id: Id51b8997f5ae1b53c24c2b4b616c6956833ed2b5
Reviewed-on: https://gerrit.instructure.com/142553
Reviewed-by: Jeremy Neander <jneander@instructure.com>
Reviewed-by: Steven Burnett <sburnett@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
Tested-by: Jenkins
2018-03-08 19:53:13 +00:00
Bryan Petty 150dfe1bb9 use RubyGems version in base docker image
Change-Id: I740ac57029983f82a7d8508a3798b47b93c3fa88
Reviewed-on: https://gerrit.instructure.com/140249
Tested-by: Jenkins
Reviewed-by: Marc Alan Phillips <mphillips@instructure.com>
QA-Review: Tyler Burraston <tburraston@instructure.com>
Product-Review: Bryan Petty <bpetty@instructure.com>
2018-02-07 22:35:06 +00:00
Ed Schiebel 40b876493e Move planner under canvas-lms
closes: CORE-949

this also upgrades us to use what was on canvas-planner master
as of 1pm on 2/1/2018 (specifically 9569cc1)

test plan:
* canvas planner should work
* all automated builds should pass

Change-Id: Iecce81d640c8aacb79189e2b26946613a03d25f2
Reviewed-on: https://gerrit.instructure.com/135947
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Tested-by: Jenkins
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2018-02-02 23:58:48 +00:00
Simon Williams a348c19725 more detailed build error handling
Change-Id: I47783225771b1e6165770abbb12e6cdb2c55c2ce
Reviewed-on: https://gerrit.instructure.com/138346
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2018-01-19 16:27:37 +00:00
Ryan Shaw c1c93e1e14 Use node 8.9.4
If you are getting errors about “The engine "node" is incompatible with 
this module. Expected version ">=8.9.4”.” after applying this change,
It means you need upgrade your node to 8.9.4. to do so:

if you use nvm: `nvm install` inside the canvas dir
If you use brew: `brew upgrade node`
If you use apt-get: see https://github.com/nodesource/distributions
If you use docker: rebuild your docker container

Closes: CORE-704

Test plan:
* js tests should pass
* webpack and brandable_css should generate the exact same
  CSS and JS output as before.
* all of our build tooling, including docker stuff, should continue
  to work and use Node 8. 

If you know of something else that needs to be updated to use node 8 
everywhere, let me know

Change-Id: Ic019710c219d8b8c627ce03e0dffde731cfa2856
Reviewed-on: https://gerrit.instructure.com/136802
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2018-01-03 20:41:37 +00:00
Steven Burnett 731723a535 upgrade yarn in dockerfile
refs: CORE-674

Change-Id: Ic660ccc55670d19a483ce89a907e7179db569b78
Reviewed-on: https://gerrit.instructure.com/133518
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
2017-11-22 16:38:35 +00:00
Shahbaz Javeed af717ee428 update postgis whenever using a postgres docker image for jenkins
This might help mitigate the dreaded postgis error we've been seeing
(OperationalError: could not access file "$libdir/postgis-X.X) while
allowing us to continue to use our docker volume caching mechanism
in jenkins

Change-Id: I9ae8f660709ce4e261ac064ce294740264166882
Reviewed-on: https://gerrit.instructure.com/133015
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Shahbaz Javeed <sjaveed@instructure.com>
QA-Review: Shahbaz Javeed <sjaveed@instructure.com>
2017-11-16 16:49:24 +00:00
Tyler Pickett c574ba71db Automatically update posgis data on boot in Jenkins
Refs: TS-3299

We think the problem is that we're using old data files with a newer
version of postgis, there is already a script to fix the problem we just
need to run it.

Change-Id: I666deb0efde95738aaa44a72a7656e1a4b287ac7
Reviewed-on: https://gerrit.instructure.com/132927
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Tyler Pickett <tpickett@instructure.com>
QA-Review: Tyler Pickett <tpickett@instructure.com>
2017-11-15 20:17:58 +00:00
Aaron Griffin 97c13ff7de chore(postgres): Use http to fix busted https
postgres' deb repo is busted for now, so we'll use http so we can carry
on with our projects.

Test Plan:
- build a docker image
- it should succeed

Change-Id: I63369f690fa7bf96b6b18d537f40eec790c95873
Reviewed-on: https://gerrit.instructure.com/132621
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Simon Williams <simon@instructure.com>
2017-11-13 19:43:46 +00:00
Omar Khan 7aebf31e78 Use postgresql-client-9.5 in development
Commit a0e14364b8 upgrades the postgres image to 9.5, but the Canvas
Dockerfile does not install a corresponding client version. This leads
to errors like this on setup:

pg_dump: server version: 9.5.9; pg_dump version: 9.3.19
pg_dump: aborting because of server version mismatch
rake aborted!
failed to execute:
pg_dump -s -x -O -f /usr/src/app/db/structure.sql --schema=public canvas

This commit fixes this issue by updating the Dockerfile to use
postgresql-client-9.5.

Test plan:

- Use a fresh dinghy VM
- Run through the docker development setup instructions
- Verify that there are no pg_dump errors
- Verify that Canvas starts and runs as expected

Change-Id: Icafbe4f280a2c40b839c36717ebe7ee133ee9b3c
Reviewed-on: https://gerrit.instructure.com/130146
Tested-by: Jenkins
Reviewed-by: Tyler Pickett <tpickett@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Omar Khan <okhan@instructure.com>
2017-10-18 20:17:54 +00:00
Jon Jensen 6d8d6abdd4 pin yarn version for docker
test plan:
docker-compose build works again \o/

Change-Id: I2d599a9463cdcca7d48e8d310c658f040b42c6a3
Reviewed-on: https://gerrit.instructure.com/125573
Tested-by: Jenkins
Reviewed-by: John Corrigan <jcorrigan@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-09-11 20:24:30 +00:00
Jon Jensen 938bf5a858 spec: exclude quiz_submission_event partitions when comparing schemas
this also means we don't have to spend any time cleaning up old ones either

Change-Id: If7af1c3bfe8a274614571a4fc5df641d4cb9a654
Reviewed-on: https://gerrit.instructure.com/121147
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-08-01 20:25:16 +00:00
Derek Bender 1db525f5f9 bump Dockerfile bundler
Change-Id: Idaa2cb5282ec62820eed3c33cebfd464bf9e33c8
Reviewed-on: https://gerrit.instructure.com/119649
Tested-by: Jenkins
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Product-Review: Derek Bender <djbender@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
2017-07-19 15:49:42 +00:00
Derek Bender ee14b415ae bump docker bundler
Change-Id: I5fd2767221c086c89190ddedd5fb6abd5800ab47
Reviewed-on: https://gerrit.instructure.com/119376
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins
Product-Review: Derek Bender <djbender@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
2017-07-18 15:53:05 +00:00
Brad Horrocks 902fca830d Fix build :fingers-crossed:
Change-Id: I2f904ddee198167efc11bc762823105a3c704b16
Reviewed-on: https://gerrit.instructure.com/118045
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2017-07-06 19:24:41 +00:00
Jon Jensen ef480cd1c3 docker enhancements/fixes, fixes SD-2499, refs gh-1043
bring the development docker image down from 3.6GB -> 2.4GB

add a production docker image that weighs in at 1.2GB, which should speed
up end-to-end tests

template-ize web Dockerfiles so that common stuff stays consistent, volume
dirs are set up properly, etc.

test plan:
1. docker-based builds should pass
2. docker image should be usable (docker-compose up, etc)

Change-Id: I41ebb155090f66e346bdc285ca5c613ee5793127
Reviewed-on: https://gerrit.instructure.com/112859
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2017-05-26 20:57:24 +00:00
Tyler Pickett f138a3a5c7 Rename docker-compose.test.yml
We need to do this because docker hub tries to run the tests when
test.yml is present and our current configuration won't allow us to
disable it. As a stopgap we're working around the sadness by moving the
file to a new name.

Change-Id: I09ce965da07f1207b58fe589d03599aa4200c242
Reviewed-on: https://gerrit.instructure.com/112101
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-05-17 18:51:53 +00:00
Landon Wilkins f934162146 da licença part 24
add consistent license headers to all source files
(ruby, coffeescript, javascript)

except for vendor files

Change-Id: Ieb58fff5a2c90fc56c3965388668992acdf40628
Reviewed-on: https://gerrit.instructure.com/110046
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-04-27 21:51:37 +00:00
Jon Jensen 456889c894 spec: build ci docker-compose on top of base one, refs SD-1574
so that we get volumes and stuff for free, and use the same images/etc by
default. also start generalizing it a bit more for the imminent dockerize
:allthethings: CI

Change-Id: Ia227c7354bb55604160343b25818598911c6ee8e
Reviewed-on: https://gerrit.instructure.com/109588
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2017-04-25 23:01:45 +00:00
Jon Jensen f33b023360 spec: fix copypasta typos in porting/refactoring this script
currently breaking the post-merge build when publishing artifacts

test plan:
1. see patchset 4's rspec build

Change-Id: Id5adde743f02b59ef5caff84652c03ba72eb906d
Reviewed-on: https://gerrit.instructure.com/109558
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2017-04-24 20:56:38 +00:00
Jon Jensen 326d5b24ed spec: bring over current CI docker-composing, refs SD-1574
Change-Id: Ibc6bea11f899b289ff2cb2c6ab45852a6b551065
Reviewed-on: https://gerrit.instructure.com/109536
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
Tested-by: Jenkins
2017-04-24 19:36:19 +00:00
Jon Jensen ec1840b502 make xsslint not need js:generate, fixes SD-2160
this does make xsslint about 10x slower, since:
1. babel is slower than acorn
2. we now have to coffeescript everything on the fly

will revisit perf in another commit

Change-Id: I2ddad309d1921ba6a4e15cd79d3d8bd956a7e403
Reviewed-on: https://gerrit.instructure.com/103850
Tested-by: Jenkins
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Landon Wilkins <lwilkins@instructure.com>
QA-Review: Landon Wilkins <lwilkins@instructure.com>
2017-03-03 17:24:16 +00:00
Landon Wilkins 89fb0241a0 move CI gergich formatters into canvas
Change-Id: I484a488b89407a05ed0290817d40893178a8e3dc
Reviewed-on: https://gerrit.instructure.com/94945
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2016-11-10 21:49:29 +00:00