diff --git a/conventional_commits/.gitlab-ci.yml b/conventional_commits/.gitlab-ci.yml index 59157d2..d59ac0e 100644 --- a/conventional_commits/.gitlab-ci.yml +++ b/conventional_commits/.gitlab-ci.yml @@ -55,6 +55,10 @@ MR Title: extends: - .conventional_commit script: + + - $ROOT_DIR/conventional_commits/scripts/commit.py --token "$MR_ACCESS_TOKEN" --project $PROJECT_ID --title --branch $CI_COMMIT_BRANCH + + - cz_exit=0 && cz check --message "$($ROOT_DIR/conventional_commits/scripts/commit.py --token "$MR_ACCESS_TOKEN" --project $PROJECT_ID --title --branch $CI_COMMIT_BRANCH)" > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME/cz_output.log" 2>&1 || cz_exit=$? - . $ROOT_DIR/conventional_commits/scripts/cz_junit.sh > "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests/$CI_JOB_NAME-cz.junit.xml" diff --git a/conventional_commits/scripts/commit.py b/conventional_commits/scripts/commit.py index e6194ea..c35f461 100755 --- a/conventional_commits/scripts/commit.py +++ b/conventional_commits/scripts/commit.py @@ -40,21 +40,32 @@ for opt, arg in opts: url = 'https://gitlab.com/api/v4/projects/' + project_id + '/merge_requests' -headers = {'PRIVATE-TOKEN': ci_job_token} + +merge_requests = "" try: - if os.environ['CI_JOB_TOKEN'] == ci_job_token: - headers = {'JOB_TOKEN': os.environ['CI_JOB_TOKEN']} + if os.environ['CI_JOB_TOKEN'] is not None: + + headers = {'JOB_TOKEN': os.environ['CI_JOB_TOKEN']} + + if os.environ['CI_JOB_TOKEN'] == ci_job_token: + + headers = {'JOB_TOKEN': os.environ['CI_JOB_TOKEN']} + + merge_requests = requests.get(url, headers=headers, data='') + merge_requests = merge_requests.json() except: pass -#print('[DEBUG] headers[{0}]'.format(headers)) -merge_requests = requests.get(url, headers=headers, data='') +if not isinstance(merge_requests, list): + headers = {'PRIVATE-TOKEN': ci_job_token} -merge_requests = merge_requests.json() + merge_requests = requests.get(url, headers=headers, data='') + + merge_requests = merge_requests.json() #print('\n\nmerge_requests=[-{0}-][]\n\n\n\n\n'.format(merge_requests))