From ebd1b48c61379fecf22d55a04b18c8be58bcb492 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Wed, 2 Mar 2016 11:36:43 -0800 Subject: [PATCH 01/13] Updated redmine scripts to extend the Dockerfile and eliminate the setup script. Commented out setup container script execution at ci root. --- config.default | 2 +- setupContainer.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.default b/config.default index ce92818..f79105b 100644 --- a/config.default +++ b/config.default @@ -49,7 +49,7 @@ REDMINE_VOLUME=redmine-volume${SUFFIX} PG_REDMINE_NAME=pg-redmine${SUFFIX} ## Redmine docker image's name -REDMINE_IMAGE_NAME=${REDMINE_IMAGE_NAME:-sameersbn/redmine} +REDMINE_IMAGE_NAME=${REDMINE_IMAGE_NAME:-ci/redmine} #PhpLDAP Admin container's name PHPLDAPADMIN_NAME=phpldapadmin${SUFFIX} diff --git a/setupContainer.sh b/setupContainer.sh index 6a8f82d..63abd29 100755 --- a/setupContainer.sh +++ b/setupContainer.sh @@ -19,8 +19,8 @@ echo ">>>> Setup Jenkins." ${SCRIPT_DIR}/jenkins-docker/setupJenkins.sh ${GERRIT_ADMIN_UID} ${GERRIT_ADMIN_EMAIL} ${SSH_KEY_PATH} ${LDAP_ACCOUNTBASE} ${JENKINS_NAME} ${GERRIT_NAME} ${GERRIT_SSH_HOST} ${GERRIT_WEBURL} ${JENKINS_WEBURL} ${LDAP_NAME} ${LDAP_VOLUME} ${SLAPD_DOMAIN} ${NEXUS_REPO} #Integrate Redmine with Openldap and import init data. -echo ">>>> Setup Redmine." -${SCRIPT_DIR}/redmine-docker/setupRedmine.sh +#echo ">>>> Setup Redmine." +#${SCRIPT_DIR}/redmine-docker/setupRedmine.sh # Add Nexus configuration files and do general Nexus setup echo ">>>> Setup Nexus." From e816a487f2e500ff15795a64e2c68d3142087e1f Mon Sep 17 00:00:00 2001 From: steve-dev Date: Wed, 2 Mar 2016 14:07:04 -0800 Subject: [PATCH 02/13] Updated redmine creation to include the GERRIT_ADMIN_PWD password parameter from the config file. --- config | 2 +- createContainer.sh | 3 ++- img-scripts/redmine-docker | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config b/config index 34e5af0..be8c0b2 100644 --- a/config +++ b/config @@ -18,7 +18,7 @@ LDAP_ACCOUNTBASE=ou=accounts,dc=demo,dc=com ## Gerrit administrator's uid in LDAP GERRIT_ADMIN_UID=admin -GERRIT_ADMIN_PWD=passwd +GERRIT_ADMIN_PWD=password GERRIT_ADMIN_EMAIL=admin@demo.com REDMINE_ADMIN_USER=$GERRIT_ADMIN_UID diff --git a/createContainer.sh b/createContainer.sh index 6229123..c6c563f 100755 --- a/createContainer.sh +++ b/createContainer.sh @@ -35,7 +35,8 @@ ${SCRIPT_DIR}/gerrit-docker/createGerrit.sh ${GERRIT_WEBURL} ${LDAP_NAME} ${LDAP ${SCRIPT_DIR}/jenkins-docker/createJenkins.sh ${JENKINS_NAME} ${JENKINS_VOLUME} ${LDAP_NAME} ${GERRIT_NAME} ${JENKINS_IMAGE_NAME} ${JENKINS_OPTS} ${TIMEZONE} # Create Redmine server container. -${SCRIPT_DIR}/redmine-docker/createRedmine.sh ${PG_REDMINE_NAME} ${POSTGRES_IMAGE_NAME} ${REDMINE_NAME} ${REDMINE_IMAGE_NAME} ${REDMINE_VOLUME} ${GERRIT_VOLUME} ${LDAP_NAME} ${LDAP_ACCOUNTBASE} +${SCRIPT_DIR}/redmine-docker/createRedmine.sh ${PG_REDMINE_NAME} ${POSTGRES_IMAGE_NAME} ${REDMINE_NAME} ${REDMINE_IMAGE_NAME} ${REDMINE_VOLUME} ${GERRIT_VOLUME} ${LDAP_NAME} ${LDAP_ACCOUNTBASE} ${GERRIT_ADMIN_PWD} + # Create DokuWiki server container. ${SCRIPT_DIR}/dokuwiki-docker/createDokuWiki.sh ${DOKUWIKI_NAME} ${DOKUWIKI_VOLUME} ${DOKUWIKI_IMAGE_NAME} ${LDAP_NAME} diff --git a/img-scripts/redmine-docker b/img-scripts/redmine-docker index ce4acec..8d345fd 160000 --- a/img-scripts/redmine-docker +++ b/img-scripts/redmine-docker @@ -1 +1 @@ -Subproject commit ce4acec8539f44de5f57874668d3a4aaccb58be9 +Subproject commit 8d345fd2e9afc5b512e73eea42a6f949c2362969 From e74a1b7715413a738ddefac1776bc4b2d1700275 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Wed, 9 Mar 2016 12:07:43 -0800 Subject: [PATCH 03/13] Added latest redmine-docker commit to ci submodules. --- img-scripts/redmine-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img-scripts/redmine-docker b/img-scripts/redmine-docker index 8d345fd..f02afd8 160000 --- a/img-scripts/redmine-docker +++ b/img-scripts/redmine-docker @@ -1 +1 @@ -Subproject commit 8d345fd2e9afc5b512e73eea42a6f949c2362969 +Subproject commit f02afd820f5689cea4b67649b567dde12bab41b9 From 9bf591d659b138aac67c1c9781534850aef4b5de Mon Sep 17 00:00:00 2001 From: steve-dev Date: Wed, 9 Mar 2016 14:17:13 -0800 Subject: [PATCH 04/13] Updated travis. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63f05fd..a80d979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ env: global: - OPENLDAP_URL= - OPENLDAP_BRANCH= - - REDMINE_URL= - - REDMINE_BRANCH= + - REDMINE_URL=https://github.com/steve-dev/redmine-docker.git + - REDMINE_BRANCH=develop - JENKINS_URL= - JENKINS_BRANCH= - JENKINS_SLAVE_URL= From 738130f6a6014132b0dd30bb811c8110fbb5cff9 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Wed, 9 Mar 2016 14:30:07 -0800 Subject: [PATCH 05/13] Updated travis to build my redmine dockerfile. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a80d979..f860ba0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ before_script: - "sh -e /etc/init.d/xvfb start" - sleep 3 # give xvfb some time to start - "./travis-submodules.sh" + - sudo docker build -t ci/redmine ./img-scripts/redmine-docker script: - "py.test -s" notifications: From bbd628511b33ade3f1caa4891b71997379fa13b1 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Wed, 9 Mar 2016 15:34:38 -0800 Subject: [PATCH 06/13] Updated redmine-docker commit. --- img-scripts/redmine-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img-scripts/redmine-docker b/img-scripts/redmine-docker index f02afd8..0df2caf 160000 --- a/img-scripts/redmine-docker +++ b/img-scripts/redmine-docker @@ -1 +1 @@ -Subproject commit f02afd820f5689cea4b67649b567dde12bab41b9 +Subproject commit 0df2caf4189da526fc0516979f2cba2c8a74ebcf From eb1e38eb0629b1dbad97f0d29022568e42742d89 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Wed, 9 Mar 2016 16:20:45 -0800 Subject: [PATCH 07/13] Updated commit for redmine-docker. --- img-scripts/redmine-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img-scripts/redmine-docker b/img-scripts/redmine-docker index 0df2caf..47f4dc8 160000 --- a/img-scripts/redmine-docker +++ b/img-scripts/redmine-docker @@ -1 +1 @@ -Subproject commit 0df2caf4189da526fc0516979f2cba2c8a74ebcf +Subproject commit 47f4dc8e66fc9e0dc1112322a73063d1a37e5939 From d4d9a48f0465579944186dad3416770ec2fbdabf Mon Sep 17 00:00:00 2001 From: steve-dev Date: Thu, 10 Mar 2016 13:58:53 -0800 Subject: [PATCH 08/13] Updated redmine submodule commit. --- img-scripts/redmine-docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img-scripts/redmine-docker b/img-scripts/redmine-docker index 47f4dc8..f0cd770 160000 --- a/img-scripts/redmine-docker +++ b/img-scripts/redmine-docker @@ -1 +1 @@ -Subproject commit 47f4dc8e66fc9e0dc1112322a73063d1a37e5939 +Subproject commit f0cd7709714a04d2924c1fd3aebf53b1243b4ded From 25aabe9eed881116b04bc8c090ccc8bb9a2d138e Mon Sep 17 00:00:00 2001 From: steve-dev Date: Thu, 10 Mar 2016 15:21:41 -0800 Subject: [PATCH 09/13] Updated password in test script and openldap module commit. --- img-scripts/openldap-docker | 2 +- test/integration/test_redmine_backup_restore.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/img-scripts/openldap-docker b/img-scripts/openldap-docker index 9497d04..c4f6991 160000 --- a/img-scripts/openldap-docker +++ b/img-scripts/openldap-docker @@ -1 +1 @@ -Subproject commit 9497d04c79f0690262c831590e2ebccfafc884a6 +Subproject commit c4f6991ade07c7da8a05a78eeb2405c92d316b6b diff --git a/test/integration/test_redmine_backup_restore.py b/test/integration/test_redmine_backup_restore.py index 127d8cd..929be6e 100644 --- a/test/integration/test_redmine_backup_restore.py +++ b/test/integration/test_redmine_backup_restore.py @@ -19,7 +19,7 @@ def configure_headless_browser(): DRIVER = webdriver.Firefox() # initilize selenium def log_into_ci(): - DRIVER.get("http://admin:passwd@localhost/redmine") + DRIVER.get("http://admin:password@localhost/redmine") def log_into_redmine(): DRIVER.get("http://localhost/redmine/login") From bb0faa0df4dea576a4a9649a5c2eea8e97440b80 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Thu, 10 Mar 2016 15:36:45 -0800 Subject: [PATCH 10/13] Updated test to not login into redmin. --- test/integration/test_redmine_backup_restore.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/integration/test_redmine_backup_restore.py b/test/integration/test_redmine_backup_restore.py index 929be6e..959f649 100644 --- a/test/integration/test_redmine_backup_restore.py +++ b/test/integration/test_redmine_backup_restore.py @@ -21,13 +21,13 @@ def configure_headless_browser(): def log_into_ci(): DRIVER.get("http://admin:password@localhost/redmine") -def log_into_redmine(): - DRIVER.get("http://localhost/redmine/login") - element = DRIVER.find_element_by_id("username") - element.send_keys("admin") - element = DRIVER.find_element_by_id("password") - element.send_keys("admin") - DRIVER.find_element_by_name("login").click() +#def log_into_redmine(): +# DRIVER.get("http://localhost/redmine/login") +# element = DRIVER.find_element_by_id("username") +# element.send_keys("admin") +# element = DRIVER.find_element_by_id("password") +# element.send_keys("admin") +# DRIVER.find_element_by_name("login").click() def create_redmine_project(): DRIVER.get("http://localhost/redmine/projects") From 377f3e3db5388367dd205fe4901d2eb1b9e45612 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Thu, 10 Mar 2016 15:46:55 -0800 Subject: [PATCH 11/13] Updated test to not call redmine login method. --- test/integration/test_redmine_backup_restore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test_redmine_backup_restore.py b/test/integration/test_redmine_backup_restore.py index 959f649..ab7929a 100644 --- a/test/integration/test_redmine_backup_restore.py +++ b/test/integration/test_redmine_backup_restore.py @@ -51,7 +51,7 @@ def setup_function(function): configure_headless_browser() log_into_ci() - log_into_redmine() +# log_into_redmine() create_redmine_project() create_redmine_issue() From 55a4ce537fd16986d1979fb608813e567bd1c431 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Thu, 10 Mar 2016 17:32:02 -0800 Subject: [PATCH 12/13] updated commit for redmine-docker submodule and set browser visibility to 1. --- img-scripts/redmine-docker | 2 +- test/integration/test_redmine_backup_restore.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/img-scripts/redmine-docker b/img-scripts/redmine-docker index f0cd770..d5feaa6 160000 --- a/img-scripts/redmine-docker +++ b/img-scripts/redmine-docker @@ -1 +1 @@ -Subproject commit f0cd7709714a04d2924c1fd3aebf53b1243b4ded +Subproject commit d5feaa62db9c04e63d7abd10d8c016831d999420 diff --git a/test/integration/test_redmine_backup_restore.py b/test/integration/test_redmine_backup_restore.py index ab7929a..c0bd7be 100644 --- a/test/integration/test_redmine_backup_restore.py +++ b/test/integration/test_redmine_backup_restore.py @@ -14,7 +14,7 @@ def check_path_test_dir(current_dir): def configure_headless_browser(): global DRIVER, DISPLAY - DISPLAY = Display(visible=0) + DISPLAY = Display(visible=1) DISPLAY.start() DRIVER = webdriver.Firefox() # initilize selenium From d5441997f12987e0dd8206102eb33bab0ec4fc66 Mon Sep 17 00:00:00 2001 From: steve-dev Date: Thu, 10 Mar 2016 17:32:33 -0800 Subject: [PATCH 13/13] Set browser vis to 0 for test. --- test/integration/test_redmine_backup_restore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test_redmine_backup_restore.py b/test/integration/test_redmine_backup_restore.py index c0bd7be..ab7929a 100644 --- a/test/integration/test_redmine_backup_restore.py +++ b/test/integration/test_redmine_backup_restore.py @@ -14,7 +14,7 @@ def check_path_test_dir(current_dir): def configure_headless_browser(): global DRIVER, DISPLAY - DISPLAY = Display(visible=1) + DISPLAY = Display(visible=0) DISPLAY.start() DRIVER = webdriver.Firefox() # initilize selenium