diff options
| -rw-r--r-- | Jenkinsfile | 23 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/system@13 (renamed from cfg-version/system@12) | 0 | ||||
| -rw-r--r-- | templates/system/time-zone/node.def | 61 |
4 files changed, 20 insertions, 66 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 3b8daeb1..225f4fce 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,11 +69,20 @@ def projectProperties = [ properties(projectProperties) setDescription() +node('Docker') { + stage('Define Agent') { + script { + // create container name on demand + env.DOCKER_IMAGE = "vyos/vyos-build:" + getGitBranchName() + } + } +} + pipeline { agent { docker { - args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' - image 'vyos/vyos-build:current' + args "--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006" + image "${env.DOCKER_IMAGE}" alwaysPull true } } @@ -121,8 +130,15 @@ pipeline { sshagent(['SSH-dev.packages.vyos.net']) { // build up some fancy groovy variables so we do not need to write/copy // every option over and over again! + def RELEASE = getGitBranchName() + if (getGitBranchName() == "master") { + RELEASE = 'current' + } + + def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + RELEASE + '/' + if (getGitBranchName() == "crux") + VYOS_REPO_PATH += 'vyos/' - def VYOS_REPO_PATH = '/home/sentrium/web/dev.packages.vyos.net/public_html/repositories/' + getGitBranchName() + '/' def SSH_OPTS = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR' def SSH_REMOTE = 'khagen@10.217.48.113' @@ -130,7 +146,6 @@ pipeline { files = findFiles(glob: '*.deb') files.each { PACKAGE -> - def RELEASE = getGitBranchName() def ARCH = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Architecture").trim() def SUBSTRING = sh(returnStdout: true, script: "dpkg-deb -f ${PACKAGE} Package").trim() def SSH_DIR = '~/VyOS/' + RELEASE + '/' + ARCH diff --git a/Makefile.am b/Makefile.am index bdf80648..5294cffc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -107,7 +107,7 @@ rsyslogdir = /etc/rsyslog.d #rsyslog_DATA = sysconf/vyatta-log.conf curver_DATA = cfg-version/vrrp@2 -curver_DATA += cfg-version/system@12 +curver_DATA += cfg-version/system@13 curver_DATA += cfg-version/broadcast-relay@1 curver_DATA += cfg-version/mdns@1 curver_DATA += cfg-version/dhcp-server@5 diff --git a/cfg-version/system@12 b/cfg-version/system@13 index e69de29b..e69de29b 100644 --- a/cfg-version/system@12 +++ b/cfg-version/system@13 diff --git a/templates/system/time-zone/node.def b/templates/system/time-zone/node.def deleted file mode 100644 index def367f4..00000000 --- a/templates/system/time-zone/node.def +++ /dev/null @@ -1,61 +0,0 @@ -priority: 100 -type: txt -help: Local time zone -default: "UTC" -update: LTF="/usr/share/zoneinfo" - case "$VAR(@)" in - [Ll][Oo][Ss]*) LTF="$LTF/US/Pacific" ;; - [Dd][Ee][Nn]*) LTF="$LTF/US/Mountain" ;; - [Hh][Oo][Nn][Oo]*) LTF="$LTF/US/Hawaii" ;; - [Nn][Ee][Ww]*) LTF="$LTF/US/Eastern" ;; - [Cc][Hh][Ii][Cc]*) LTF="$LTF/US/Central" ;; - [Aa][Nn][Cc]*) LTF="$LTF/US/Alaska" ;; - [Pp][Hh][Oo]*) LTF="$LTF/US/Arizona" ;; - GMT*) LTF="$LTF/Etc/$VAR(@)" ;; - *) LTF="$LTF/$VAR(@)" ;; - esac - if [ -f "$LTF" ]; then - sudo ln -fs $LTF /etc/localtime - sudo sh -c "echo $VAR(@) > /etc/timezone" - else - echo "Invalid timezone" - exit 1 - fi -delete: sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime - sudo sh -c "echo UTC > /etc/timezone" -allowed: shopt -s nullglob - word=${COMP_WORDS[$COMP_CWORD]} - if [[ $word == */* ]]; then - marr=($(ls -d /usr/share/zoneinfo/$word*)) - else - marr=($(find /usr/share/zoneinfo/ -maxdepth 1 -type d \ - -name "$word*")) - fi - if (( ${#marr[@]} == 1 )); then - word=${marr[0]#/usr/share/zoneinfo/} - fi - if [ -n "$word" ] && [[ $word != */ ]]; then - marr=($(ls -d /usr/share/zoneinfo/$word*)) - if (( ${#marr[@]} == 1 )) \ - && [ -d "/usr/share/zoneinfo/$word" ]; then - word=$word/ - elif [[ $word == */* ]]; then - word=${word%/*}/ - fi - fi - for z in $(ls -d /usr/share/zoneinfo/$word* \ - 2>/dev/null | egrep '^/usr/share/zoneinfo/[A-Z]'); do - zz=${z#/usr/share/zoneinfo/} - if [ -d $z ] || [[ $zz == */* ]]; then - echo \"$zz\" - fi - done -end: if [ "$COMMIT_ACTION" == "SET" -o "$COMMIT_ACTION" == "DELETE" ]; then - sudo /etc/init.d/rsyslog restart - fi -comp_help:Enter the local timezone by specifying "Region/City" - Use auto-completion to see available regions and cities. - Start with one of these regions: - Africa America Antarctica Arctic Asia Atlantic - Australia Brazil Canada Chile Europe Indian - Mexico Mideast Pacific US |