commit d8f8d4891fe883134a068cda1b8d248b47d50265
author Zack Williams <zdw@opennetworking.org> Tue Jun 05 16:41:34 2018 +0000
committer Gerrit Code Review <gerrit@opencord.org> Tue Jun 05 16:41:34 2018 +0000
tree 60ccf7decf0c855f59ab9366e41332b78beb5a38
parent 81b275965c57ac48f6f287f4c3da8c6ad6b42163
parent 5ec719bf79da513b220b841c9ef33a2c6f149436

Merge "Increase JJB version to 2.0.5 to match global-jjb"

jjb/charts.yaml

diff --git a/jjb/charts.yaml b/jjb/charts.yaml
index ce2fd37..b4f0590 100644
--- a/jjb/charts.yaml
+++ b/jjb/charts.yaml
@@ -53,12 +53,4 @@
           helm init --client-only
           helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/
           ./scripts/helmrepo.sh
-
-# publish over ssh: https://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.ssh
-    publishers:
-      - ssh:
-          site: '{docs-ssh-host}'
-          source: 'chart_repo/**'
-          remove-prefix: 'chart_repo'
-          target: '//var/www/charts/$GERRIT_BRANCH'
-
+          rsync -rvzh --delete chart_repo/ {docs-ssh-host}:/var/www/charts/$GERRIT_BRANCH

jjb/cord-test/rcord-lite.yaml

diff --git a/jjb/cord-test/rcord-lite.yaml b/jjb/cord-test/rcord-lite.yaml
index bbc1b11..b71bafd 100644
--- a/jjb/cord-test/rcord-lite.yaml
+++ b/jjb/cord-test/rcord-lite.yaml
@@ -15,5 +15,5 @@
          kube-pod: 'flex-onf-pod1'
          profile: 'rcord-lite'
          branch: 'master'
-         Jenkinsfile: 'Jenkinsfile.rcordlite'
+         Jenkinsfile: 'Jenkinsfile-rcordlite'
          time: '20'

jjb/docs-legacy.yaml

diff --git a/jjb/docs-legacy.yaml b/jjb/docs-legacy.yaml
index 69dcafa..c8875ca 100644
--- a/jjb/docs-legacy.yaml
+++ b/jjb/docs-legacy.yaml
@@ -95,16 +95,5 @@
       - shell: |
           cd cord/build/docs
           make build
-
-# publish over ssh: https://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.ssh
-    publishers:
-      - ssh:
-          site: '{docs-ssh-host}'
-          source: 'cord/build/docs/_book/**'
-          remove-prefix: 'cord/build/docs/_book'
-          target: '//var/www/guide/$GERRIT_BRANCH'
-      - ssh:
-          site: '{docs-ssh-host}'
-          source: 'cord/build/docs/xos/swagger/**'
-          remove-prefix: 'cord/build/docs/xos'
-          target: '//var/www/guide/$GERRIT_BRANCH'
+          rsync -rvzh --delete cord/docs/_book/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH
+          rsync -rvzh --delete cord/docs/xos/swagger/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH

jjb/docs.yaml

diff --git a/jjb/docs.yaml b/jjb/docs.yaml
index aec942f..4cbe987 100644
--- a/jjb/docs.yaml
+++ b/jjb/docs.yaml
@@ -138,16 +138,5 @@
       - shell: |
           cd cord/docs
           make build
-
-# publish over ssh: https://docs.openstack.org/infra/jenkins-job-builder/publishers.html#publishers.ssh
-    publishers:
-      - ssh:
-          site: '{docs-ssh-host}'
-          source: 'cord/docs/_book/**'
-          remove-prefix: 'cord/docs/_book'
-          target: '//var/www/guide/$GERRIT_BRANCH'
-      - ssh:
-          site: '{docs-ssh-host}'
-          source: 'cord/docs/xos/swagger/**'
-          remove-prefix: 'cord/docs/xos'
-          target: '//var/www/guide/$GERRIT_BRANCH'
+          rsync -rvzh --delete cord/docs/_book/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH
+          rsync -rvzh --delete cord/docs/xos/swagger/ {docs-ssh-host}:/var/www/guide/$GERRIT_BRANCH