Merge "Introducing rsync in docs publish. Removing olt scp plugin."
diff --git a/Makefile b/Makefile
index 74377f4..c096b44 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
.PHONY: test clean
VENV_DIR ?= venv-jjb
-JJB_VERSION ?= 2.0.3
+JJB_VERSION ?= 2.0.5
JOBCONFIG_DIR ?= job-configs
$(VENV_DIR):
@@ -20,7 +20,7 @@
test: $(VENV_DIR) $(JOBCONFIG_DIR)
source $(VENV_DIR)/bin/activate ; \
pipdeptree ; \
- jenkins-jobs -l DEBUG test --recursive -o $(JOBCONFIG_DIR) jjb/ ;
+ jenkins-jobs -l DEBUG test --recursive --config-xml -o $(JOBCONFIG_DIR) jjb/ ;
clean:
rm -rf $(VENV_DIR) $(JOBCONFIG_DIR)
diff --git a/jjb/cord-test/rcord-lite.yaml b/jjb/cord-test/rcord-lite.yaml
index bf494c3..bbc1b11 100644
--- a/jjb/cord-test/rcord-lite.yaml
+++ b/jjb/cord-test/rcord-lite.yaml
@@ -11,7 +11,7 @@
jobs:
# flex onf pod 1 kubernetes build jobs (rcord lite)
- 'build_kube_pod_first':
- testvm: 'qa-testvm-pod1'
+ testvm: 'qa-testvm-pod'
kube-pod: 'flex-onf-pod1'
profile: 'rcord-lite'
branch: 'master'
diff --git a/jjb/global-jjb b/jjb/global-jjb
index ad0ee7c..d1b7f48 160000
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit ad0ee7c792b24345f2b419b3418bd84eac0f6ac1
+Subproject commit d1b7f48bb76729ddde974357b4de845db71bb5a8
diff --git a/jjb/shell/licensecheck.sh b/jjb/shell/licensecheck.sh
index e40802a..d0b2347 100755
--- a/jjb/shell/licensecheck.sh
+++ b/jjb/shell/licensecheck.sh
@@ -31,6 +31,7 @@
! -name "*.curl" \
! -name "*.db" \
! -name "*.der" \
+ ! -name "*.desc" \
! -name "*.diff" \
! -name "*.dnsmasq" \
! -name "*.do" \