Merge pull request #537 from cloudfoundry/develop

merge develop to master

.gitmodules

@@ -145,3 +145,6 @@
 [submodule "src/github.com/patrickmn/go-cache"]
 	path = src/github.com/patrickmn/go-cache
 	url = https://github.com/patrickmn/go-cache
+[submodule "src/github.com/juju/ratelimit"]
+	path = src/github.com/juju/ratelimit
+	url = https://github.com/juju/ratelimit

.travis.yml

@@ -1,17 +1,18 @@
-
-
-dist: trusty
-sudo: required
+os: linux
+dist: xenial
 
 env:
   global:
     - DBURL=postgres://postgres@localhost/autoscaler?sslmode=disable
     - NODE_VERSION=6.2
-    - GO_VERSION=1.11
+    - GO_VERSION=1.13.3
     - LOGLEVEL=info
 language: java
+cache:
+  directories:
+    - $HOME/.m2
 jdk:
-- openjdk8
+  - openjdk8
 services:
   - postgresql
 addons:
@@ -21,7 +22,7 @@ before_install:
 install:
   - mvn package
   - npm install npm@latest -g
-  - nvm install $NODE_VERSION
+  - nvm install $NODE_VERSION --silent
   - eval "$(gimme $GO_VERSION)"
   - go install github.com/onsi/ginkgo/ginkgo
 
@@ -36,37 +37,61 @@ before_script:
   - java -cp 'db/target/lib/*' liquibase.integration.commandline.Main --url jdbc:postgresql://127.0.0.1/autoscaler --driver=org.postgresql.Driver --changeLogFile=src/autoscaler/eventgenerator/db/dataaggregator.db.changelog.yml update
   - java -cp 'db/target/lib/*' liquibase.integration.commandline.Main --url jdbc:postgresql://127.0.0.1/autoscaler --driver=org.postgresql.Driver --changeLogFile=src/autoscaler/scalingengine/db/scalingengine.db.changelog.yml update
   - java -cp 'db/target/lib/*' liquibase.integration.commandline.Main --url jdbc:postgresql://127.0.0.1/autoscaler --driver=org.postgresql.Driver --changeLogFile=src/autoscaler/operator/db/operator.db.changelog.yml update
-
-matrix:
+  - wget https://repo.mysql.com//mysql-apt-config_0.8.14-1_all.deb
+  - sudo dpkg -i mysql-apt-config_0.8.14-1_all.deb
+  - sudo apt-get update -q
+  - sudo apt-get install -q -y --allow-unauthenticated -o Dpkg::Options::=--force-confnew mysql-server
+  - sudo systemctl restart mysql
+  - sudo mysql_upgrade
+  - mysql --version
+  - mysql -u root -e "CREATE DATABASE autoscaler;"
+  - java -cp 'db/target/lib/*' liquibase.integration.commandline.Main --url jdbc:mysql://127.0.0.1/autoscaler --driver=com.mysql.cj.jdbc.Driver --changeLogFile=api/db/api.db.changelog.yml --username=root update
+  - java -cp 'db/target/lib/*' liquibase.integration.commandline.Main --url jdbc:mysql://127.0.0.1/autoscaler --driver=com.mysql.cj.jdbc.Driver --changeLogFile=scheduler/db/scheduler.changelog-master.yaml --username=root update
+  - java -cp 'db/target/lib/*' liquibase.integration.commandline.Main --url jdbc:mysql://127.0.0.1/autoscaler --driver=com.mysql.cj.jdbc.Driver --changeLogFile=scheduler/db/quartz.changelog-master.yaml --username=root update
+jobs:
   include:
-  - name: unit test
-    script:
-      # Unit test
-      - pushd api
-      - npm install
-      - npm test
-      - popd
-      - pushd servicebroker
-      - npm install
-      - npm test
-      - popd
-      - pushd src/autoscaler
-      - ginkgo -r -race -randomizeAllSpecs
-      - popd
-      - pushd scheduler
-      - mvn test
-      - popd
+    - name: unit test
+      script:
+        # Unit test
+        - pushd src/autoscaler
+        - ginkgo -r -race -randomizeAllSpecs
+        - popd
+        - pushd scheduler
+        - mvn test
+        - mvn test -Dspring.profiles.active=mysql
+
+    - name: integration test
+      script:
+        # Integration test
+        - pushd scheduler
+        - mvn package -DskipTests
+        - popd
+        - ginkgo -r -race -randomizeAllSpecs src/integration
+
+    # Tests for legacy components (node apiserver, broker and metricscollector)
+    # - name: legacy unit test
+    #   script:
+    #     - pushd api
+    #     - npm install
+    #     - npm test
+    #     - popd
+    #     - pushd servicebroker
+    #     - npm install
+    #     - npm test
+    #     - popd
+
+    # - name: legacy integration test
+    #   script:
+    #     - pushd api
+    #     - npm install
+    #     - npm test
+    #     - popd
+    #     - pushd servicebroker
+    #     - npm install
+    #     - npm test
+    #     - popd
+    #     - pushd scheduler
+    #     - mvn package -DskipTests
+    #     - popd
+    #     - ginkgo -r -race -randomizeAllSpecs src/integration_legacy
 
-  - name: integration test
-    script:
-      # Integration test
-      - pushd api
-      - npm install
-      - popd
-      - pushd servicebroker
-      - npm install
-      - popd
-      - pushd scheduler
-      - mvn package -DskipTests
-      - popd
-      - ginkgo -r -race -randomizeAllSpecs src/integration 

README.md

@@ -83,16 +83,6 @@ rm $TMPDIR/consul-0.7.5.zip
 ### Unit tests
 
 ```shell
-pushd api
-npm install
-npm test
-popd
-
-pushd servicebroker
-npm install
-npm test
-popd
-
 go install github.com/onsi/ginkgo/ginkgo
 export DBURL=postgres://postgres@localhost/autoscaler?sslmode=disable
 pushd src/autoscaler
@@ -107,14 +97,6 @@ popd
 ### Integration tests
 
 ```shell
-pushd api
-npm install
-popd
-
-pushd servicebroker
-npm install
-popd
-
 pushd scheduler
 mvn package -DskipTests
 popd

api/db/api.db.changelog.yml

@@ -8,6 +8,10 @@ databaseChangeLog:
       name: policy_json.type
       value: text
       dbms: h2
+   - property:
+      name: policy_json.type
+      value: json
+      dbms: mysql
    - changeSet:
       id: 1
       author: pradyutsarma

db/pom.xml

@@ -28,6 +28,11 @@
 			<artifactId>postgresql</artifactId>
 			<version>42.2.5</version>
 		</dependency>
+		<dependency>
+		    <groupId>mysql</groupId>
+		    <artifactId>mysql-connector-java</artifactId>
+		    <version>8.0.18</version>
+		</dependency>
 	</dependencies>
 
 	<build>