Browse Source

Merge pull request #9511 from Silverpeas/silverpeas-6.2

Silverpeas 6.2
yosifkit 4 years ago
parent
commit
526e9aa29f
2 changed files with 6 additions and 4 deletions
  1. 5 3
      library/silverpeas
  2. 1 1
      test/tests/silverpeas-basics/run.sh

+ 5 - 3
library/silverpeas

@@ -1,10 +1,12 @@
 # This file is generated via https://github.com/Silverpeas/docker-silverpeas-prod/blob/master/generate-docker-library.sh
-
 Maintainers: Miguel Moquillon <[email protected]> (@mmoqui)
 GitRepo: https://github.com/Silverpeas/docker-silverpeas-prod.git
 
-Tags: 6.1.1, latest
-GitCommit: 84d84260f98ef3895465d87da1786afabde8a8b2
+Tags: 6.2, latest
+GitCommit: 558d384db05b003735f876a2d8a96aa3d404bfb4
+
+Tags: 6.1.2
+GitCommit: a4d6289629004ca954b8a24890eac4d4dc83a597
 
 Tags: 6.0.2
 GitCommit: 189a4f2db783d5052add54f2c07ca7a3b860c685

+ 1 - 1
test/tests/silverpeas-basics/run.sh

@@ -68,7 +68,7 @@ check_running() {
 }
 
 # wait for the Silverpeas starting to be completed
-. "$dir/../../retry.sh" --tries 20 --sleep 5 'check_running'
+. "$dir/../../retry.sh" --tries 20 --sleep 10 'check_running'
 
 expected='Configured: [OK] Running:    [OK] Active:     [OK]  INFO: JBoss is running '
 [ "$(docker exec "$cname" /opt/silverpeas/bin/silverpeas status | tr '\n' ' ')" = "$expected" ]