T6315: fixed PR review comments on repo pr template and workflows

5 files changed, 2 insertions, 19 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index cd348ea..4c8266c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,7 +14,6 @@ the box, please use [x]
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Code style update (formatting, renaming)
 - [ ] Refactoring (no functional changes)
-- [ ] Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
 - [ ] Other (please describe):
 
 ## Related Task(s)
@@ -24,9 +23,6 @@ the box, please use [x]
 ## Related PR(s)
 <!-- Link here any PRs in other repositories that are required by this PR -->
 
-## Component(s) name
-<!-- A rather incomplete list of components: ethernet, wireguard, bgp, mpls, ldp, l2tp, dhcp ... -->
-
 ## Proposed changes
 <!--- Describe your changes in detail -->
 
@@ -40,21 +36,12 @@ like this
 ```
 -->
 
-## Smoketest result
-<!-- Provide the output of the smoketest
-```
-$ /usr/libexec/vyos/tests/smoke/cli/test_xxx_feature.py
-test_01_simple_options (__main__.TestFeature.test_01_simple_options) ... ok
-```
--->
-
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
 <!--- The entire development process is outlined here: https://docs.vyos.io/en/latest/contributing/development.html -->
 - [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/current/CONTRIBUTING.md) document
 - [ ] I have linked this PR to one or more Phabricator Task(s)
-- [ ] I have run the components [**SMOKETESTS**](https://github.com/vyos/vyos-1x/tree/current/smoketest/scripts/cli) if applicable
 - [ ] My commit headlines contain a valid Task id
 - [ ] My change requires a change to the documentation
 - [ ] I have updated the documentation accordingly
diff --git a/.github/labeler.yml b/.github/labeler.yml
index e0b9ee4..3a16d27 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -4,9 +4,6 @@ equuleus:
 current:
   - any:
     - base-branch: 'current'
-crux:
-  - any:
-    - base-branch: 'crux'
 sagitta:
   - any:
     - base-branch: 'sagitta'
diff --git a/.github/workflows/pull-request-labels.yml b/.github/workflows/pull-request-labels.yml
index 43856be..31e1bd9 100644
--- a/.github/workflows/pull-request-labels.yml
+++ b/.github/workflows/pull-request-labels.yml
@@ -5,7 +5,6 @@ on:
   pull_request_target:
     branches:
       - current
-      - crux
       - equuleus
       - sagitta
 
diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml
index 3a855c1..9918649 100644
--- a/.github/workflows/pull-request-management.yml
+++ b/.github/workflows/pull-request-management.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches:
       - current
-      - crux
+      - sagitta
       - equuleus
 
 jobs:
diff --git a/.github/workflows/pull-request-message-check.yml b/.github/workflows/pull-request-message-check.yml
index 8c206a5..aee2dec 100644
--- a/.github/workflows/pull-request-message-check.yml
+++ b/.github/workflows/pull-request-message-check.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches:
       - current
-      - crux
+      - sagitta
       - equuleus
 
 jobs: