Admin password update attempt #4

.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=
@@ -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
   - sudo docker build -t ci/dokuwiki ./img-scripts/dokuwiki-docker
   - sudo docker build -t ci/nexus ./img-scripts/nexus-docker
   - sudo docker build -t ci/nginx ./img-scripts/nginx-docker

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

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}

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}

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."

test/integration/test_redmine_backup_restore.py

@@ -19,15 +19,15 @@ 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")
-    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")
@@ -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()