polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject polygene-java git commit: Must have messed up the Docker image generation somehow, and I have no idea how it was supposed to work in the first place.
Date Thu, 19 Apr 2018 04:02:52 GMT
Repository: polygene-java
Updated Branches:
  refs/heads/develop 7489e06b5 -> 77b68068a


Must have messed up the Docker image generation somehow, and I have no idea how it was supposed
to work in the first place.


Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/77b68068
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/77b68068
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/77b68068

Branch: refs/heads/develop
Commit: 77b68068ad47719cbe9a40147b9607ca3595a88b
Parents: 7489e06
Author: niclas <niclas@hedhman.org>
Authored: Thu Apr 19 12:02:46 2018 +0800
Committer: niclas <niclas@hedhman.org>
Committed: Thu Apr 19 12:02:46 2018 +0800

----------------------------------------------------------------------
 .../polygene/entitystore/jclouds/JCloudsS3Test.java      |  7 ++++++-
 .../polygene/entitystore/jclouds/JCloudsS3TestSuite.java | 11 ++++++++---
 .../entitystore/mongodb/MongoDBEntityStoreTest.java      |  2 +-
 .../entitystore/mongodb/MongoDBEntityStoreTestSuite.java |  2 +-
 .../mongodb/MongoDBEntityStoreWithCacheTest.java         |  2 +-
 .../polygene/entitystore/riak/RiakEntityStoreTest.java   |  2 +-
 .../entitystore/riak/RiakEntityStoreTestSuite.java       |  2 +-
 .../entitystore/riak/RiakEntityStoreWithCacheTest.java   |  2 +-
 .../entitystore/sqlkv/MariaDbEntityStoreTest.java        |  4 +---
 .../entitystore/sqlkv/MariaDbEntityStoreTestSuite.java   |  2 --
 .../polygene/entitystore/sqlkv/MySQLEntityStoreTest.java |  2 --
 .../entitystore/sqlkv/MySQLEntityStoreTestSuite.java     |  2 --
 12 files changed, 21 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
b/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
index adb25ba..664acdb 100644
--- a/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
+++ b/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java
@@ -20,6 +20,7 @@
 package org.apache.polygene.entitystore.jclouds;
 
 import com.github.junit5docker.Docker;
+import com.github.junit5docker.Environment;
 import com.github.junit5docker.Port;
 import com.github.junit5docker.WaitFor;
 import org.apache.polygene.api.common.Visibility;
@@ -28,9 +29,13 @@ import org.apache.polygene.entitystore.jclouds.assembly.JCloudsEntityStoreAssemb
 import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-s3server",
+@Docker( image = "s3server",
          ports = @Port( exposed = 8801, inner = 8000),
          waitFor = @WaitFor( value = "server started", timeoutInMillis = 30000),
+         environments = {
+             @Environment( key = "SCALITY_ACCESS_KEY_ID", value = "dummyIdentifier" ),
+             @Environment( key = "SCALITY_SECRET_ACCESS_KEY", value = "dummyCredential" )
+         },
          newForEachCase = false
 )
 public class JCloudsS3Test extends AbstractEntityStoreTest

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3TestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3TestSuite.java
b/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3TestSuite.java
index 5fca708..8591cde 100644
--- a/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3TestSuite.java
+++ b/extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3TestSuite.java
@@ -20,6 +20,7 @@
 package org.apache.polygene.entitystore.jclouds;
 
 import com.github.junit5docker.Docker;
+import com.github.junit5docker.Environment;
 import com.github.junit5docker.Port;
 import com.github.junit5docker.WaitFor;
 import org.apache.polygene.api.common.Visibility;
@@ -27,9 +28,13 @@ import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.entitystore.jclouds.assembly.JCloudsEntityStoreAssembler;
 import org.apache.polygene.test.entity.model.EntityStoreTestSuite;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-s3server",
-         ports = @Port( exposed = 8801, inner = 8000),
-         waitFor = @WaitFor( value = "server started", timeoutInMillis = 30000),
+@Docker( image = "s3server",
+         ports = @Port( exposed = 8801, inner = 8000 ),
+         waitFor = @WaitFor( value = "server started", timeoutInMillis = 30000 ),
+         environments = {
+             @Environment( key = "SCALITY_ACCESS_KEY_ID", value = "dummyIdentifier" ),
+             @Environment( key = "SCALITY_SECRET_ACCESS_KEY", value = "dummyCredential" )
+         },
          newForEachCase = false
 )
 public class JCloudsS3TestSuite extends EntityStoreTestSuite

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
index 103ec57..6dfb295 100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.BeforeEach;
 /**
  * Test the MongoDBEntityStoreService.
  */
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo",
+@Docker( image = "mongo",
          ports = @Port( exposed = 8801, inner = 27017),
          newForEachCase = false
 )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java
b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java
index c9fe8b3..efe0547 100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.BeforeEach;
 /**
  * Test the MongoDBEntityStoreService.
  */
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo",
+@Docker( image = "mongo",
          ports = @Port( exposed = 8801, inner = 27017),
          waitFor = @WaitFor( value = "MongoDB starting", timeoutInMillis = 30000),
          newForEachCase = false

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
index fb3c850..3a257ef 100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.BeforeEach;
 /**
  * Test the MongoDBEntityStoreService usage with a CachePool.
  */
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo",
+@Docker( image = "mongo",
          ports = @Port( exposed = 8801, inner = 27017),
          newForEachCase = false
 )

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
index dae77ea..c3b2acf 100644
--- a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
+++ b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java
@@ -29,7 +29,7 @@ import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-riak",
+@Docker( image = "riak",
          ports = @Port( exposed = 8801, inner = 8087),
          waitFor = @WaitFor( value = "riak_auth_mods started on node", timeoutInMillis =
60000),
          newForEachCase = false

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTestSuite.java
b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTestSuite.java
index aefb338..b8330d1 100644
--- a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTestSuite.java
+++ b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTestSuite.java
@@ -29,7 +29,7 @@ import org.apache.polygene.test.entity.model.EntityStoreTestSuite;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-riak",
+@Docker( image = "riak",
          ports = @Port( exposed = 8801, inner = 8087),
          waitFor = @WaitFor( value = "riak_auth_mods started on node", timeoutInMillis =
60000),
          newForEachCase = false

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
index e97e219..22d0317 100644
--- a/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java
@@ -32,7 +32,7 @@ import org.apache.polygene.test.cache.AbstractEntityStoreWithCacheTest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-riak",
+@Docker( image = "riak",
          ports = @Port( exposed = 8801, inner = 8087 ),
          waitFor = @WaitFor( value = "riak_auth_mods started on node", timeoutInMillis =
60000 ),
          newForEachCase = false

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
index d26699c..1f82735 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java
@@ -36,14 +36,12 @@ import org.jooq.SQLDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 
-@Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR")
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mariadb",
+@Docker( image = "mariadb",
          ports = @Port( exposed = 8801, inner = 3306),
          environments = {
              @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
              @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
              @Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
-             @Environment( key = "MYSQL_ROOT_HOST", value = "172.17.0.1"),
          },
          waitFor = @WaitFor( value = "mysqld: ready for connections",timeoutInMillis = 30000),
          newForEachCase = false

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
index 10d7ff2..128a6e0 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java
@@ -34,14 +34,12 @@ import org.jooq.SQLDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 
-@Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR")
 @Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mariadb",
          ports = @Port( exposed = 8801, inner = 3306),
          environments = {
              @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
              @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
              @Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
-             @Environment( key = "MYSQL_ROOT_HOST", value = "172.17.0.1"),
          },
          waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000),
          newForEachCase = false

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
index e94da01..66417c8 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTest.java
@@ -36,13 +36,11 @@ import org.jooq.SQLDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 
-@Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR")
 @Docker( image = "mysql", ports = @Port( exposed = 8801, inner = 3306),
          environments = {
              @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
              @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
              @Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
-             @Environment( key = "MYSQL_ROOT_HOST", value = "172.17.0.1"),
          },
          waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000),
          newForEachCase = false

http://git-wip-us.apache.org/repos/asf/polygene-java/blob/77b68068/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
index ed15aa3..60efc37 100644
--- a/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
+++ b/extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MySQLEntityStoreTestSuite.java
@@ -34,13 +34,11 @@ import org.jooq.SQLDialect;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 
-@Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR")
 @Docker( image = "mysql", ports = @Port( exposed = 8801, inner = 3306),
          environments = {
              @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
              @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
              @Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
-             @Environment( key = "MYSQL_ROOT_HOST", value = "172.17.0.1"),
          },
          waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000),
          newForEachCase = false


Mime
View raw message