Remove bad branches

Author: okorach-sonar

test/files/audit-config.json

@@ -248,7 +248,6 @@
          "sonar.cpd.cross_project": false,
          "sonar.dbcleaner.auditHousekeeping": "Monthly",
          "sonar.dbcleaner.branchesToKeepWhenInactive": [
-            "comma,branch",
             "develop",
             "main",
             "master",
@@ -759,7 +758,6 @@
                "BANKING-INVESTMENT-EQUITY": "-DEFAULT_BRANCH-",
                "BANKING-INVESTMENT-MERGER": "-DEFAULT_BRANCH-",
                "BANKING-PORTAL": [
-                  "comma,branch",
                   "main",
                   "release-3.2"
                ]
@@ -960,9 +958,6 @@
       },
       "BANKING-PORTAL": {
          "branches": {
-            "comma,branch": {
-               "keepWhenInactive": true
-            },
             "main": {
                "isMain": true
             },
@@ -1978,10 +1973,6 @@
       },
       "okorach_sonar-tools": {
          "branches": {
-            "comma,branch": {
-               "keepWhenInactive": true,
-               "newCodePeriod": "REFERENCE_BRANCH = develop"
-            },
             "develop": {
                "keepWhenInactive": true,
                "newCodePeriod": "REFERENCE_BRANCH = master"

test/files/config-for-audit.json

@@ -55,7 +55,6 @@
          "sonar.dbcleaner.hoursBeforeKeepingOnlyOneSnapshotByDay": "24",
          "sonar.dbcleaner.daysBeforeDeletingInactiveBranchesAndPRs": "30",
          "sonar.dbcleaner.branchesToKeepWhenInactive": [
-            "comma,branch",
             "develop",
             "main",
             "master",

test/files/config.json

@@ -56,7 +56,6 @@
          "sonar.dbcleaner.hoursBeforeKeepingOnlyOneSnapshotByDay": "24",
          "sonar.dbcleaner.daysBeforeDeletingInactiveBranchesAndPRs": "30",
          "sonar.dbcleaner.branchesToKeepWhenInactive": [
-            "comma,branch",
             "develop",
             "main",
             "master",
@@ -3437,9 +3436,6 @@
             }
          },
          "branches": {
-            "comma,branch": {
-               "keepWhenInactive": true
-            },
             "release-3.2": {
                "keepWhenInactive": true
             },
@@ -4687,35 +4683,6 @@
             }
          ]
       },
-      "okorach_sonar-tools-target": {
-         "name": "Sonar Tools Target",
-         "visibility": "private",
-         "permissions": {
-            "users": {
-               "admin": "admin, codeviewer, user",
-               "syncer": "codeviewer, issueadmin, securityhotspotadmin, user"
-            },
-            "groups": {
-               "developers": "codeviewer, user",
-               "project-admins": "admin, codeviewer, user",
-               "security-auditors": "codeviewer, issueadmin, securityhotspotadmin, user",
-               "sonar-administrators": "admin, codeviewer, user",
-               "sonar-users": "user",
-               "tech-leads": "codeviewer, issueadmin, user"
-            }
-         },
-         "branches": {
-            "master": {
-               "isMain": true
-            },
-            "develop": {
-               "keepWhenInactive": true
-            },
-            "comma,branch": {
-               "keepWhenInactive": true
-            }
-         }
-      },
       "org.owasp.webgoat:webgoat": {
          "name": "WebGoat",
          "visibility": "private",
@@ -4794,9 +4761,6 @@
             }
          },
          "branches": {
-            "comma,branch": {
-               "keepWhenInactive": true
-            },
             "release-2.x": {
                "keepWhenInactive": true
             },
@@ -5449,7 +5413,6 @@
                "BANKING-INVESTMENT-EQUITY": "-DEFAULT_BRANCH-",
                "BANKING-INVESTMENT-MERGER": "-DEFAULT_BRANCH-",
                "BANKING-PORTAL": [
-                  "comma,branch",
                   "main",
                   "release-3.2"
                ]

test/projects-provisioning/scan.sh

@@ -14,7 +14,7 @@ for p in $projects; do
     sonar-scanner -Dsonar.projectKey=$p -Dsonar.host.url=$url -Dsonar.branch.name=develop -Dsonar.login=$SONAR_TOKEN -Dsonar.token=$SONAR_TOKEN
 done
 
-branches="feature/new-feature some-branch comma,branch release-2.x release-3.x"
+branches="feature/new-feature some-branch release-3.x"
 for b in $branches; do
     echo "Processing $p"
     sonar-scanner -Dsonar.projectKey=$p -Dsonar.host.url=$url -Dsonar.projectKey=project1 -Dsonar.branch.name=$b -Dsonar.login=$SONAR_TOKEN -Dsonar.token=$SONAR_TOKEN

test/test-sync.sh

@@ -5,7 +5,7 @@ do
    curl -X POST -u "$SONAR_TOKEN:" "$SONAR_HOST_URL/api/projects/delete?project=$proj"
    opts=("-Dsonar.projectKey=$proj" "-Dsonar.projectName=$proj")
    conf/run_all.sh "${opts[@]}" "$@"
-   for branch in release-1.x release-2.x
+   for branch in release-2.x release-2.x
    do
       conf/run_all.sh "${opts[@]}" "$@" "-Dsonar.branch.name=$branch"
    done

test/unit/test_portfolios.py

@@ -113,7 +113,7 @@ def test_add_project(get_test_portfolio: Generator[pf.Portfolio]) -> None:
     assert p.has_project(project.key)
 
     p.add_project_branches(project.key, [c.DEFAULT_BRANCH, "develop"])
-    p.add_project_branches(project.key, ["comma,branch", "develop"])
+    p.add_project_branches(project.key, ["release-3.x", "develop"])
     assert p.recompute()
 
 

test/unit/utilities.py

@@ -63,9 +63,9 @@
 PROJ_WITH_BRANCHES = PROJECT_1
 BRANCH_MAIN = "main"
 BRANCH_2 = "develop"
-BRANCH_3 = "some-branch"
+BRANCH_3 = "release-3.x"
 BRANCH_4 = "feature/new-feature"
-BRANCH_5 = "comma,branch"
+BRANCH_5 = "release-2.x"
 
 NON_EXISTING_KEY = "non-existing"