experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test: change make test from all -> sum, make vagrant yang checkout more resilient

Browse source 
New slack invite
This commit is contained in:
Olof hagsand 2022-06-23 16:35:06 +02:00
parent 33c77c8a09
commit 05918e3ca2
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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 Clixon interaction is best done posting issues, pull requests, or joining the
[slack channel](https://clixondev.slack.com). [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/) Clixon is sponsored by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/)

2
docker/main/Makefile.in
View file

@ -83,7 +83,7 @@ push:
# therefore the sleep 1 before tests start # therefore the sleep 1 before tests start
test: docker test: docker
./cleanup.sh ; ./start.sh # kill (ignore error) and the start it ./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: depend:

9
test/vagrant/vagrant.sh
View file

@ -281,7 +281,8 @@ $sshcmd ./clixon.sh $release $wwwuser ${with_restconf}
cat<<EOF > $dir/yangmodels.sh cat<<EOF > $dir/yangmodels.sh
set -eux set -eux
cd /usr/local/share cd /usr/local/share
test -d yang || mkdir yang rm -rf yang
mkdir yang
cd yang cd yang
git config --global init.defaultBranch master git config --global init.defaultBranch master
git init git init
@ -293,11 +294,11 @@ git pull origin main
# Patch yang syntax errors # 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 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 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 # openconfig
cd /usr/local/share cd /usr/local/share
test -d openconfig || mkdir openconfig rm -rf openconfig
mkdir openconfig
cd openconfig
git clone https://github.com/openconfig/public git clone https://github.com/openconfig/public
EOF EOF
chmod 755 $dir/yangmodels.sh chmod 755 $dir/yangmodels.sh