Merge pull request #3942 from c-po/bugfixes

T6560: T4694: T6555: multiple minor bugfixes for package build
vyos · Aug 5, 2024 · 7306a7f · 7306a7f
2 parents 3ce5485 + 2fd817e
commit 7306a7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml
@@ -37,6 +37,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: packages/vyos-1x
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Build vyos-1x package
         run: |
           cd packages/vyos-1x; dpkg-buildpackage -uc -us -tc -b

diff --git a/interface-definitions/include/firewall/gre.xml.i b/interface-definitions/include/firewall/gre.xml.i
@@ -33,7 +33,7 @@
                 <valueless/>
               </properties>
             </leafNode>
-          </children>            
+          </children>
         </node>
         <node name="sequence">
           <properties>
@@ -94,7 +94,7 @@
         </constraint>
       </properties>
     </leafNode>
-    #include <interface/parameters-key.xml.i>
+    #include <include/interface/parameters-key.xml.i>
     <leafNode name="version">
       <properties>
         <help>GRE Version</help>

diff --git a/smoketest/scripts/cli/test_interfaces_openvpn.py b/smoketest/scripts/cli/test_interfaces_openvpn.py
@@ -678,7 +678,7 @@ def test_openvpn_server_server_bridge(self):
         self.assertIn(f'dh /run/openvpn/{vtun_if}_dh.pem', config)
 
         # check that no interface remained after deleting them
-        self.cli_delete((['interfaces', 'bridge', br_if, 'member', 'interface', vtun_if])
+        self.cli_delete(['interfaces', 'bridge', br_if, 'member', 'interface', vtun_if])
         self.cli_delete(base_path)
         self.cli_commit()