diff options
| -rw-r--r-- | Jenkinsfile | 12 | ||||
| -rwxr-xr-x | src/conf_mode/snmp.py | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 6ea34f372..a169b8f2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -88,16 +88,8 @@ pipeline { steps { script { dir('build') { - scm { - git { - remote { - name(getGitRepoName()) - url(getGitRepoURL()) - refspec('+refs/pull/*:refs/remotes/origin/pr/*') - } - branch('${sha1}') - } - } + git branch: getGitBranchName(), + url: getGitRepoURL() } } } diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py index b64cccbfa..6c0ef91c3 100755 --- a/src/conf_mode/snmp.py +++ b/src/conf_mode/snmp.py @@ -27,7 +27,7 @@ import vyos.validate from binascii import hexlify from shutil import move from time import sleep -from stat import S_IRWXU,S_IXGRP,S_IXOTH +from stat import S_IRWXU,S_IXGRP,S_IXOTH,S_IROTH,S_IRGRP from vyos.config import Config from vyos import ConfigError @@ -552,7 +552,7 @@ def verify(snmp): if not os.path.isfile(ext['script']): print ("WARNING: script: {} doesn't exist".format(ext['script'])) else: - os.chmod(ext['script'], S_IRWXU|S_IXGRP|S_IXOTH) + os.chmod(ext['script'], S_IRWXU|S_IXGRP|S_IXOTH|S_IROTH|S_IRGRP) for listen in snmp['listen_address']: addr = listen[0] |