Merge branch 'vyos:current' into current

2 files changed, 0 insertions, 55 deletions

diff --git a/scripts/check-pr-title-and-commit-messages.py b/scripts/check-pr-title-and-commit-messages.py
deleted file mode 100755
index f7376e98..00000000
--- a/scripts/check-pr-title-and-commit-messages.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-
-import re
-import sys
-import time
-
-import requests
-
-# Use the same regex for PR title and commit messages for now
-title_regex = r'^(([a-zA-Z\-_.]+:\s)?)T\d+:\s+[^\s]+.*'
-commit_regex = title_regex
-
-
-def check_pr_title(title):
-    if not re.match(title_regex, title):
-        print(f"PR title '{title}' does not match the required format!")
-        print("Valid title example: T99999: make IPsec secure")
-        sys.exit(1)
-
-
-def check_commit_message(title):
-    if not re.match(commit_regex, title):
-        print(f"Commit title '{title}' does not match the required format!")
-        print("Valid title example: T99999: make IPsec secure")
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2:
-        print("Please specify pull request URL!")
-        sys.exit(1)
-
-    # There seems to be a race condition that causes this scripts to receive
-    # an incomplete PR object that is missing certain fields,
-    # which causes temporary CI failures that require re-running the script
-    #
-    # It's probably better to add a small delay to prevent that
-    time.sleep(5)
-
-    # Get the pull request object
-    pr = requests.get(sys.argv[1]).json()
-    if "title" not in pr:
-        print("The PR object does not have a title field!")
-        print("Did not receive a valid pull request object, please check the URL!")
-        sys.exit(1)
-
-    check_pr_title(pr["title"])
-
-    # Get the list of commits
-    commits = requests.get(pr["commits_url"]).json()
-    for c in commits:
-        # Retrieve every individual commit and check its title
-        co = requests.get(c["url"]).json()
-        check_commit_message(co["commit"]["message"])
diff --git a/scripts/image-build/raw_image.py b/scripts/image-build/raw_image.py
index 5068ba1b..dedb6f5e 100644
--- a/scripts/image-build/raw_image.py
+++ b/scripts/image-build/raw_image.py
@@ -18,7 +18,6 @@
 import os
 import sys
 import shutil
-import traceback
 
 import vyos.utils.process