From 05918e3ca2a9147bf192ba65fec688e17b321bd3 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Thu, 23 Jun 2022 16:35:06 +0200 Subject: [PATCH] Test: change make test from all -> sum, make vagrant yang checkout more resilient New slack invite --- README.md | 2 +- docker/main/Makefile.in | 2 +- test/vagrant/vagrant.sh | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 22b36f7a..8fb0908d 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,6 @@ Clixon has a master branch continuously tested with CI, but releases are made ca Clixon interaction is best done posting issues, pull requests, or joining the [slack channel](https://clixondev.slack.com). -[Slack invite](https://join.slack.com/t/clixondev/shared_invite/zt-191czm376-kWvI3tyDdqDU86DlfbLRxg)(updated 16/5 2022) +[Slack invite](https://join.slack.com/t/clixondev/shared_invite/zt-1b5y2pno7-g4Ih92CrBK1dxTgip1Hkvw)(updated 23/6 2022, valid 30d) Clixon is sponsored by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/) diff --git a/docker/main/Makefile.in b/docker/main/Makefile.in index 1f0eae74..fdc61f00 100644 --- a/docker/main/Makefile.in +++ b/docker/main/Makefile.in @@ -83,7 +83,7 @@ push: # therefore the sleep 1 before tests start test: docker ./cleanup.sh ; ./start.sh # kill (ignore error) and the start it - sudo docker exec -t clixon-system bash -c 'sleep 2 && cd /usr/local/bin/test && ./all.sh' + sudo docker exec -t clixon-system bash -c 'sleep 2 && cd /usr/local/bin/test && ./sum.sh' depend: diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh index de5948b5..d5967d5c 100755 --- a/test/vagrant/vagrant.sh +++ b/test/vagrant/vagrant.sh @@ -281,7 +281,8 @@ $sshcmd ./clixon.sh $release $wwwuser ${with_restconf} cat< $dir/yangmodels.sh set -eux cd /usr/local/share -test -d yang || mkdir yang +rm -rf yang +mkdir yang cd yang git config --global init.defaultBranch master git init @@ -293,11 +294,11 @@ git pull origin main # Patch yang syntax errors sed s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang > ieee802-ethernet-pon2.yang mv ieee802-ethernet-pon2.yang /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang -sudo sed 's/”/"/' /usr/local/share/yang/standard/iana/iana-if-type@2022-03-07.yang > iana-if-type@2022-03-07-2.yang -sudo mv iana-if-type@2022-03-07-2.yang /usr/local/share/yang/standard/iana/iana-if-type@2022-03-07.yang # openconfig cd /usr/local/share -test -d openconfig || mkdir openconfig +rm -rf openconfig +mkdir openconfig +cd openconfig git clone https://github.com/openconfig/public EOF chmod 755 $dir/yangmodels.sh