diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59dc6f94f05b62e2dea651bebb8716bd65046c6b..8fc8d93f3125f0398b58b090abd8842f0bdd04db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,12 +74,12 @@ build: - master test: image: docker:latest - variables: - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - stage: test + # variables: + # DOCKER_HOST: tcp://docker:2375 + # DOCKER_TLS_CERTDIR: "" + # stage: test services: - - docker:19.03.1-dind + - docker:19.03.0-dind before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - chmod +x env_setup.sh wait_for_container.sh diff --git a/registrar_test.py b/registrar_test.py index d23cf3f8f29269c330ca7eeecb0ea9c05dac8436..281f462c3a40ce55cda4b4cef0c846e1693012c9 100644 --- a/registrar_test.py +++ b/registrar_test.py @@ -9,17 +9,16 @@ with open('./env/emg_db.env', 'r') as f: ) database= env['DB_NAME'].replace('\n','') port = env['DB_PORT'].replace('\n','') -# host = env['DB_HOST'].replace('\n','') +host = env['DB_HOST'].replace('\n','') database_password= env['DB_PW'].replace('\n','') database_user = env['DB_USER'].replace('\n','') -host= os.environ.get('DOCKER_HOST') def connect_to_db(eo_id): global db_name, coverage_id connection= None try: - connection = psycopg2.connect(dbname=database, user=database_user, password=database_password, host=host, port=port) + connection = psycopg2.connect(dbname=database, user=database_user, password=database_password, host='127.0.01', port=port) cursor = connection.cursor() db_name = connection.get_dsn_parameters()["dbname"] postgreSQL_select_Query = "SELECT identifier FROM coverages_eoobject WHERE identifier = '%s';" % eo_id