Commit 6779f14e authored by Loïc Gouarin's avatar Loïc Gouarin
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !214
parents 9a150f50 809bc474
Pipeline #4447 passed with stages
in 32 seconds
......@@ -630,8 +630,8 @@ def create_job_request(job_offer, debug):
try:
# TODO: remove GITLAB_TOKEN variable from gitlab_config.py, revoke token and use the line below
# instead of os.gentenv()
# gitlab_private_token = os.environ['GITLAB_PRIVATE_TOKEN']
gitlab_private_token = os.getenv('GITLAB_PRIVATE_TOKEN', GITLAB_TOKEN)
gitlab_private_token = os.environ['GITLAB_TOKEN']
# gitlab_private_token = os.getenv('GITLAB_PRIVATE_TOKEN', GITLAB_TOKEN)
except KeyError:
print("[ERROR] GITLAB_PRIVATE_TOKEN environment variable not set!", file=sys.stderr)
raise
......
import os
# Gitlab configuration
GITLAB_URL = "https://gitlab.math.unistra.fr"
GITLAB_TOKEN = os.environ["GITLAB_TOKEN"]
GITLAB_TARGET_ID = 309 # groupe-calcul/website
GITLAB_TARGET_BRANCH = 'develop'
GITLAB_SOURCE_ID = 309 # groupe-calcul/website
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment