Skip to content

Commit 3439590

Browse files
authored
[utilities] Install SONiC YANG dependency for CLI tests (sonic-net#121)
* Install SONiC YANG package * Move relative paths for utilities tests Signed-off-by: Danny Allen <daall@microsoft.com>
1 parent 537e726 commit 3439590

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

jenkins/common/sonic-utilities-build-pr/Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ pipeline {
1010
userRemoteConfigs: [[url: 'https://github.com/Azure/sonic-utilities',
1111
refspec: '+refs/pull/*:refs/remotes/origin/pr/*']]])
1212
}
13-
copyArtifacts(projectName: 'sonic-swss-common-build', filter: '**/*.deb', target: 'swss-common', flatten: true)
14-
copyArtifacts(projectName: '../vs/sonic-swss-build', filter: '**/*.deb', target: 'swss', flatten: true)
15-
copyArtifacts(projectName: '../vs/sonic-sairedis-build', filter: '**/*.deb', target: 'sairedis', flatten: true)
16-
copyArtifacts(projectName: '../vs/buildimage-vs-all', filter: '**/*', target: 'buildimage', flatten: false)
13+
copyArtifacts(projectName: 'common/sonic-swss-common-build', filter: '**/*.deb', target: 'swss-common', flatten: true)
14+
copyArtifacts(projectName: 'vs/sonic-swss-build', filter: '**/*.deb', target: 'swss', flatten: true)
15+
copyArtifacts(projectName: 'vs/sonic-sairedis-build', filter: '**/*.deb', target: 'sairedis', flatten: true)
16+
copyArtifacts(projectName: 'vs/buildimage-vs-all', filter: '**/*', target: 'buildimage', flatten: false)
1717
}
1818
}
1919

jenkins/common/sonic-utilities-build/Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ pipeline {
1717
branches: [[name: '*/master']],
1818
userRemoteConfigs: [[url: 'https://github.com/Azure/sonic-utilities']]])
1919
}
20-
copyArtifacts(projectName: 'sonic-swss-common-build', filter: '**/*.deb', target: 'swss-common', flatten: true)
21-
copyArtifacts(projectName: '../vs/sonic-swss-build', filter: '**/*.deb', target: 'swss', flatten: true)
22-
copyArtifacts(projectName: '../vs/sonic-sairedis-build', filter: '**/*.deb', target: 'sairedis', flatten: true)
23-
copyArtifacts(projectName: '../vs/buildimage-vs-all', filter: '**/*', target: 'buildimage', flatten: false)
20+
copyArtifacts(projectName: 'common/sonic-swss-common-build', filter: '**/*.deb', target: 'swss-common', flatten: true)
21+
copyArtifacts(projectName: 'vs/sonic-swss-build', filter: '**/*.deb', target: 'swss', flatten: true)
22+
copyArtifacts(projectName: 'vs/sonic-sairedis-build', filter: '**/*.deb', target: 'sairedis', flatten: true)
23+
copyArtifacts(projectName: 'vs/buildimage-vs-all', filter: '**/*', target: 'buildimage', flatten: false)
2424
}
2525
}
2626

scripts/common/sonic-utilities-build/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ sudo pip install tabulate
1313
sudo pip install natsort
1414
sudo pip install buildimage/target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl
1515
sudo pip install buildimage/target/python-wheels/swsssdk-2.0.1-py2-none-any.whl
16+
sudo pip install buildimage/target/python-wheels/sonic_yang_mgmt-1.0-py2-none-any.whl
1617
sudo pip install mockredispy==2.9.3
1718
sudo pip install netifaces==0.10.9
1819
sudo pip install --upgrade setuptools

0 commit comments

Comments
 (0)