From 3143fe0cfe2a4cd17d3e3fa166c208e7dfa7c060 Mon Sep 17 00:00:00 2001
From: Victor Laza <vlaza@cloudbasesolutions.com>
Date: Wed, 15 Apr 2015 12:13:37 +0300
Subject: Configured artifacts publish daily & on merge for projects with
 documentation

JIRA: DOCS-2 - artifacts publish daily & on merge for the following projects:
opnfvdocs, octopus, genesis, functest, pharos

Change-Id: Id055d8e955e1c55c6b18a5bdf28d940ef7d53729
Signed-off-by: Victor Laza <vlaza@cloudbasesolutions.com>
---
 jjb/octopus/build-docu.sh |  1 +
 jjb/octopus/octopus.yml   | 69 ++++++++---------------------------------------
 2 files changed, 12 insertions(+), 58 deletions(-)

(limited to 'jjb/octopus')

diff --git a/jjb/octopus/build-docu.sh b/jjb/octopus/build-docu.sh
index cbbf265d3..558451dbb 100644
--- a/jjb/octopus/build-docu.sh
+++ b/jjb/octopus/build-docu.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -xv
 for file in $(find . -type f -iname '*.rst'); do
          file_cut="${{file%.*}}"
          html_file=$file_cut".html"
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 40b25dea5..b465537e7 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -69,10 +69,12 @@
         - test-macro
 
     builders:
+        - shell:
+            !include-raw build-docu.sh
         - shell: |
-            pwd
-            find .
-            echo "Hello world from octopus {somevar} daily"
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
+
 
     postbuilders:
         - test-macro
@@ -123,10 +125,8 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell: |
-            pwd
-            find .
-            echo "verify logic goes here"
+        - shell:
+            !include-raw build-docu.sh
 
 - job-template:
     name: 'octopus-merge'
@@ -173,58 +173,11 @@
                       branch-pattern: '**/master'
 
     builders:
+        - shell:
+            !include-raw build-docu.sh
         - shell: |
-            pwd
-            find .
-            echo "merge logic goes here"
-
-- job-template:
-     name: 'octopus-build-docs'
-
-     project-type: freestyle
-
-     logrotate:
-         daysToKeep: 30
-         numToKeep: 40
-         artifactDaysToKeep: -1
-         artifactNumToKeep: 5
-
-     parameters:
-         - project-parameter:
-             project: '{project}'
-         - gerrit-parameter:
-             branch: 'master'
-
-     scm:
-         - gerrit-trigger-scm:
-             credentials-id: '{ssh-credentials}'
-             refspec: ''
-             choosing-strategy: 'default'
-
-     wrappers:
-         - ssh-agent-credentials:
-             user: '{ssh-credentials}'
-
-     triggers:
-         - gerrit:
-             trigger-on:
-                 - change-merged-event
-                 - comment-added-contains-event:
-                     comment-contains-value: 'remerge'
-             projects:
-               - project-compare-type: 'ANT'
-                 project-pattern: 'octopus'
-                 branches:
-                     - branch-compare-type: 'ANT'
-                       branch-pattern: '**/master'
-
-     builders:
-         - shell:
-             !include-raw build-docu.sh
-
-
-
-
+           gsutil cp docs/*.pdf gs://artifacts.opnfv.org/octopus/docs/
+           gsutil cp docs/*.html gs://artifacts.opnfv.org/octopus/docs/
 
 
 
-- 
cgit 1.2.3-korg