Skip to content

[build] fix build exception and revert #9136 #10037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 2 commits into from
Feb 21, 2022
Merged

[build] fix build exception and revert #9136 #10037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b686efe
Revert "[nvgre] Added YANG model and tests (#9136)"
ghooo Feb 19, 2022
41af9eb
pinning MarkupSafe==2.0.1 to avoid 2.1 removing 'soft_unicode' problem
ghooo Feb 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-image-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
[ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
git checkout -b $BRANCH_NAME
sudo modprobe overlay
pip3 install MarkupSafe==2.0.1 --force-reinstall
sudo apt-get install -y acl
sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
Expand Down
2 changes: 0 additions & 2 deletions src/sonic-yang-models/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ def run(self):
'./yang-models/sonic-mirror-session.yang',
'./yang-models/sonic-ntp.yang',
'./yang-models/sonic-nat.yang',
'./yang-models/sonic-nvgre-tunnel.yang',
'./yang-models/sonic-pbh.yang',
'./yang-models/sonic-port.yang',
'./yang-models/sonic-policer.yang',
Expand Down Expand Up @@ -166,7 +165,6 @@ def run(self):
'./cvlyang-models/sonic-mgmt_vrf.yang',
'./cvlyang-models/sonic-ntp.yang',
'./cvlyang-models/sonic-nat.yang',
'./cvlyang-models/sonic-nvgre-tunnel.yang',
'./cvlyang-models/sonic-pbh.yang',
'./cvlyang-models/sonic-policer.yang',
'./cvlyang-models/sonic-port.yang',
Expand Down
21 changes: 2 additions & 19 deletions src/sonic-yang-models/tests/files/sample_config_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,7 @@
}
},


"MCLAG_DOMAIN": {
"123": {
"source_ip": "12.1.1.1",
Expand Down Expand Up @@ -1584,8 +1584,6 @@

}
},


"POLICER": {
"everflow_static_policer": {
"meter_type": "bytes",
Expand All @@ -1594,23 +1592,8 @@
"cbs": "12500000",
"color": "aware",
"red_packet_action": "drop"
}
},


"NVGRE_TUNNEL": {
"tunnel_1": {
"src_ip": "10.0.0.1"
}
},
"NVGRE_TUNNEL_MAP": {
"tunnel_1|Vlan111": {
"vlan_id": "111",
"vsid": "5000"
}
}
}


},
"SAMPLE_CONFIG_DB_UNKNOWN": {
"UNKNOWN_TABLE": {
Expand Down
25 changes: 0 additions & 25 deletions src/sonic-yang-models/tests/yang_model_tests/tests/nvgre.json
View file
Open in desktop

This file was deleted.

125 changes: 0 additions & 125 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/nvgre.json
View file
Open in desktop

This file was deleted.

114 changes: 0 additions & 114 deletions src/sonic-yang-models/yang-models/sonic-nvgre-tunnel.yang
View file
Open in desktop

This file was deleted.