3 files changed, 69 insertions, 0 deletions
diff --git a/jjb/octopus/.availability.yml.swp b/jjb/octopus/.availability.yml.swp
new file mode 100644
index 000000000..7ca652091
--- /dev/null
+++ b/jjb/octopus/.availability.yml.swp
diff --git a/jjb/octopus/octopus.cfg b/jjb/octopus/octopus.cfg
new file mode 100644
index 000000000..27cff6f0f
--- /dev/null
+++ b/jjb/octopus/octopus.cfg
@@ -0,0 +1,3 @@
+DEPENDENCIES: none
+JOB_TEMPLATES: merge,daily
+BRANCHES: master
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
new file mode 100644
index 000000000..125ba5a0c
--- /dev/null
+++ b/jjb/octopus/octopus.yml
@@ -0,0 +1,66 @@
+- project:
+    name: octopus
+    jobs:
+        - 'octopus-test'
+        - 'octopus-daily-master'
+
+    # stream:    branch with - in place of / (eg. stable-helium)
+    # branch:    branch (eg. stable/helium)
+    stream:
+        - master:
+            branch: 'master'
+
+    project: 'octopus'
+    somevar: 'foo'
+
+- job-template:
+    name: octopus-test
+
+    project-type: freestyle
+
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 10
+        artifactDaysToKeep: -1
+        artifactNumToKeep: -1
+
+    builders:
+        - shell: |
+            echo "Hello world from octopus"
+
+- job-template:
+    name: 'octopus-daily-master'
+
+    # Job template for daily builders
+    #
+    # Required Variables:
+    #     stream:    branch with - in place of / (eg. stable)
+    #     branch:    branch (eg. stable)
+
+    project-type: freestyle
+    varsetabove: '{somevar}'
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    wrappers:
+        - ssh-agent-credentials:
+            user: '{ssh-credentials}'
+
+    triggers:
+        - timed: 'H H * * *'
+
+    prebuilders:
+        - test-macro
+
+    builders:
+        - shell: |
+            echo "Hello world from octopus {somevar} daily"
+        - test-macro
+
+    postbuilders:
+        - test-macro
+