Commit deaf0253 authored by admin_forge's avatar admin_forge
Browse files

Merge branch 'fix-build-script' into '2.6.1-dev' 

Removed python script for Gerrit, fixed return code of build script

See merge request nfv/SOL002-SOL003!8
parents 3d108331 e0b57621

.jenkins.sh

+2 −4
Original line number Original line Diff line number Diff line
@@ -14,9 +14,7 @@ cd docker 




./build-container.sh

./build-container.sh

./run-container.sh "${run_dir}" "$1"

./run-container.sh "${run_dir}" "$1"

OUTCOME=$?





cd ..

exit $OUTCOME

python ./scripts/add_change_comment.py



exit $?

scripts/add_change_comment.py

deleted100644 → 0
+0 −24
Original line number Original line Diff line number Diff line 
"""

Add comments on gerrit

"""



import os

import sys

import jnk_grt_comment as jgc

import glob



CHANGE = os.environ.get('GERRIT_CHANGE_NUMBER') or None

PATCH = os.environ.get('GERRIT_PATCHSET_NUMBER') or None

URL = os.environ.get('BUILD_URL') or None



# print glob.glob("**/*-API.yaml")



if not (CHANGE and PATCH and URL):

    print "No Gerrit change information found. Exiting"

    sys.exit()



print "START Comment on Gerrit change ---"



jgc.comment_openapis_artifacts(CHANGE, PATCH, URL)



print "DONE Comment on Gerrit change ---\n"

scripts/jnk_grt_comment.py

deleted100644 → 0
+0 −51
Original line number Original line Diff line number Diff line 
#!/env/python2.7



"""

Comments on gerrit

"""



import os.path

import subprocess

import glob



def mk_swg_ui_link(artifact, build_uri):

    """

      creates the link to the swagger ui

    """

    swg_ui = "https://forge.etsi.org/swagger/ui"

    return swg_ui + "/?url=" + build_uri + "/artifact/"+ artifact +"/*view*/"





def mk_swg_ui_comment(files, bu):

    """

      creates the link to the swagger ui

    """

    msg = "Review links for the built OpenAPIS:"

    for artifact in glob.glob(files):

        msg += "\n * " + os.path.basename(artifact) + ": " + mk_swg_ui_link(artifact, bu)

    return msg



def mk_grt_comment_cmd(change, payload):

    """

      creates the link to the swagger ui

    """

    command = "ssh -p 29418 forge.etsi.org \"gerrit review --message '"+payload+"'  "+change + "\""

    print command

    return command





def send_gerrit_comment(change, patchset):

    """

      creates the link to the swagger ui

    """

    cmd = mk_grt_comment_cmd(change, patchset)

    print "Executing: " + cmd

    subprocess.call(cmd, shell=True)



def jenkins_gerrit_comment(change_num, patch_num, comment):

    send_gerrit_comment(change_num+","+patch_num, comment)



def comment_openapis_artifacts(cn, pn, bu):

    comment = mk_swg_ui_comment("build/*-API.yaml", bu)

    # print "comment: "+comment

    jenkins_gerrit_comment(str(cn), str(pn), comment)
 
 No newline at end of file