Commit b3e6eede authored by GridexX's avatar GridexX Committed by Thomas Boni
Browse files

chore: remove stage from notif discord 



Signed-off-by: default avatarGridexX <arsene582@gmail.com>
parent bfe69454

.gitlab-ci.yml

+5 −6
Original line number Diff line number Diff line
@@ -232,15 +232,14 @@ discord_notifier: 
  dependencies:

    - template_release

  script:

    - cd ${RELEASE_PATH}

    - RELEASES=$(ls "$RELEASE_PATH")

    - |

      for release in *; do

      for release in $RELEASES; do

        JOB="$(echo "$release" | cut -d'@' -f1 | sed -e 's/|/\//g')"

        VERSION="$(echo "$release" | sed -E 's/.*@([0-9]+\.[0-9]+\.[0-9]+)\..*$/\1/')"

        STAGE="$(echo "$release" | sed -E 's/.*\.([^.]+)\.md$/\1/')"

        CHANGELOG=$(cat "$release")

        echo "New version detected for $JOB@$VERSION, STAGE: $STAGE, sending notification to discord"

        pipenv run python tools/notify/discord_release_notify.py -n ${JOB} -v ${VERSION} -c "${CHANGELOG}" -s ${STAGE}

        CHANGELOG=$(cat "$RELEASE_PATH/$release")

        echo "New version detected for $JOB@$VERSION, sending notification to discord"

        pipenv run python tools/notify/discord_release_notify.py -n ${JOB} -v ${VERSION} -c "${CHANGELOG}"

      done

  rules:

   - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH_SLUG == "r2devops-hub"'

tools/notify/discord_release_notify.py

+8 −12
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ USERNAME = "R2" # Message's author 
EMBED_COLOR = 1127128 # Trailing color at left of message

EMBED_TITLE = "A new job version is available for " # Title of the message

EMBED_DESCRIPTION = "Wanna see what's new ? :point_down:" # Content of the message (body)

DOC_LINK = "https://r2devops.io/jobs/"

API_JOBS_LINK = "https://api.r2devops.io/job/"

R2_BOT_USER = "r2devops-bot"

DOC_LINK = "https://r2devops.io/_/gitlab/r2devops/hub"

API_JOBS_LINK = "https://api.r2devops.io/job/gitlab/r2devops/hub"

IGNORE_QUERY_PARAM = "ignore=true"



def get_random_quote():

    """Retrieve a random quote from R2Devops Snippet
@@ -34,14 +34,13 @@ def get_random_quote(): 
        data = response.json()

        return random.choice(data)



def generate_data(name: str, version: str, changelog: str, stage: str):

def generate_data(name: str, version: str, changelog: str):

    """Generate the body of the request



    Args:

        name (str): Name of the job

        version (str): Version of the job

        changelog (str): Changelog of the job

        stage (str): Stage of the job

    Returns:

        object: Describe the format and content of discord notification

    """
@@ -52,12 +51,12 @@ def generate_data(name: str, version: str, changelog: str, stage: str): 
    logging.debug(job_path)



    #send an http GET request to the quotes url

    job_url="{0}{1}/{2}".format(API_JOBS_LINK, R2_BOT_USER, name.lower())

    job_url="{0}/{1}?{2}".format(API_JOBS_LINK, name.lower(), IGNORE_QUERY_PARAM)

    job_metadata_request=requests.get(job_url)

    icon = "🏷"



    if job_metadata_request.status_code != 200:

        logging.error("[WARN] Job %s not found for user %s with request %s", name.lower(), R2_BOT_USER, job_url)

        logging.error("[WARN] Job %s not found with request %s", name.lower(), job_url)

        logging.error("[WARN] In order to proceed, we are replacing the job icon by default: 🏷")

    else:

        icon = job_metadata_request.json()["icon"]
@@ -74,7 +73,7 @@ def generate_data(name: str, version: str, changelog: str, stage: str): 
                "fields": [

                        {

                            "name": "Documentation",

                            "value": "{0}{1}/{2}/".format(DOC_LINK, stage, name.lower())

                            "value": "{0}/{1}/".format(DOC_LINK, name.lower())

                        },

                        {

                            "name": "Version",
@@ -135,9 +134,6 @@ def main(): 
    parser.add_argument("--changelog", "-c",

    type=str, required=True, help="R2DevOps job's changelog")



    parser.add_argument("--stage", "-s",

    type=str, required=True, help="R2DevOps job's stage")



    parser.add_argument("--webhook", "-w",

    type=str, default=os.getenv("DISCORD_RELEASE_WEBHOOK"),

    help="Custom Discord WebHook (default: {})".format(os.getenv("DISCORD_RELEASE_WEBHOOK")))
@@ -149,7 +145,7 @@ def main(): 
    args = parser.parse_args()

    logging.basicConfig(level=args.loglevel)



    data_format = generate_data(args.name, args.version, args.changelog, args.stage)

    data_format = generate_data(args.name, args.version, args.changelog)

    send_message(args.webhook, data_format)



if __name__ == "__main__":