diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-08-05 11:33:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-05 11:33:27 +0100 |
| commit | 7306a7feac60989cc51d641423e74d819fd73b1c (patch) | |
| tree | 139d165fe65a5dd2f3bab219ee7f86664d924145 | |
| parent | 3ce54858c2e71ced522ecfb1781fa60eec703217 (diff) | |
| parent | 2fd817e51532c6428c95704233e62585e76b2ad8 (diff) | |
| download | vyos-1x-7306a7feac60989cc51d641423e74d819fd73b1c.tar.gz vyos-1x-7306a7feac60989cc51d641423e74d819fd73b1c.zip | |
Merge pull request #3942 from c-po/bugfixes
T6560: T4694: T6555: multiple minor bugfixes for package build
| -rw-r--r-- | .github/workflows/package-smoketest.yml | 2 | ||||
| -rw-r--r-- | interface-definitions/include/firewall/gre.xml.i | 4 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_interfaces_openvpn.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml index 0a8208b87..467ff062e 100644 --- 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 index 285233434..e7b9fd5b1 100644 --- 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 index 5584501c5..f23a28c25 100755 --- a/smoketest/scripts/cli/test_interfaces_openvpn.py +++ b/smoketest/scripts/cli/test_interfaces_openvpn.py @@ -678,7 +678,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase): 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() |