From 698926e352294bd167cfe158a71689c8606bce7b Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Wed, 27 Sep 2017 12:29:16 -0600
Subject: putting jjb tree in here

---
 bootstrap/config.yaml.example         |  4 ++++
 build-docker-containers.sh            | 45 +++++++++++++++++++++++++++++++++++
 ci-script.sh                          | 45 -----------------------------------
 jjb/.gitignore                        |  2 ++
 jjb/example.ini                       | 13 ++++++++++
 jjb/run.sh                            |  4 ++++
 jjb/yaml/build-docker-containers.yaml | 23 ++++++++++++++++++
 7 files changed, 91 insertions(+), 45 deletions(-)
 create mode 100755 build-docker-containers.sh
 delete mode 100755 ci-script.sh
 create mode 100644 jjb/.gitignore
 create mode 100644 jjb/example.ini
 create mode 100755 jjb/run.sh
 create mode 100644 jjb/yaml/build-docker-containers.yaml

diff --git a/bootstrap/config.yaml.example b/bootstrap/config.yaml.example
index ffadfd0..c68d232 100644
--- a/bootstrap/config.yaml.example
+++ b/bootstrap/config.yaml.example
@@ -6,3 +6,7 @@ jars:
   url: ~
   username: ~
   password: ~
+admin_api_server:
+  port: 8081
+customer_api_server:
+  port: 8083
diff --git a/build-docker-containers.sh b/build-docker-containers.sh
new file mode 100755
index 0000000..5627f32
--- /dev/null
+++ b/build-docker-containers.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+buildroot="$(pwd)"
+
+# clean docker containers
+if [ -x ${buildroot}/docker_build/ci/openbookctl ]; then
+    sudo ${buildroot}/docker_build/ci/openbookctl stop
+fi
+for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do
+    sudo docker stop $i
+done
+for i in $(sudo docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do
+    sudo docker stop $i
+done
+sudo docker container prune -f
+for i in $(sudo docker images | grep -v 'REPOSITORY' | awk '{print $3}'); do
+    sudo docker rmi --force $i
+done
+
+# clean the build files
+rm -rf ${HOME}/openbook-v4-installer
+sudo rm -rf /root/openbook_build /etc/openbook /var/lib/mysql /var/log/mysql /var/log/openbook
+
+# configure salt
+cp ${HOME}/config.yaml /srv/bootstrap/
+
+# run salt to create build scripts
+sudo /srv/bootstrap/run_salt.sh
+
+# build new docker containers
+sudo /root/openbook_build/ci/build.sh
+
+# refresh openbook-v4-installer repo (ansible playbook)
+pushd ${HOME}
+git clone git@github.com:Talligent/openbook-v4-installer.git
+sudo rsync -aq --delete --exclude=.git /root/openbook_build/ansible/ openbook-v4-installer/
+sudo chown -R jenkins: openbook-v4-installer
+pushd openbook-v4-installer/
+git add -A
+git commit -a -m "autocommit $(date)"
+git push
+popd
+popd
+
+exit 0
diff --git a/ci-script.sh b/ci-script.sh
deleted file mode 100755
index 5627f32..0000000
--- a/ci-script.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-buildroot="$(pwd)"
-
-# clean docker containers
-if [ -x ${buildroot}/docker_build/ci/openbookctl ]; then
-    sudo ${buildroot}/docker_build/ci/openbookctl stop
-fi
-for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do
-    sudo docker stop $i
-done
-for i in $(sudo docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do
-    sudo docker stop $i
-done
-sudo docker container prune -f
-for i in $(sudo docker images | grep -v 'REPOSITORY' | awk '{print $3}'); do
-    sudo docker rmi --force $i
-done
-
-# clean the build files
-rm -rf ${HOME}/openbook-v4-installer
-sudo rm -rf /root/openbook_build /etc/openbook /var/lib/mysql /var/log/mysql /var/log/openbook
-
-# configure salt
-cp ${HOME}/config.yaml /srv/bootstrap/
-
-# run salt to create build scripts
-sudo /srv/bootstrap/run_salt.sh
-
-# build new docker containers
-sudo /root/openbook_build/ci/build.sh
-
-# refresh openbook-v4-installer repo (ansible playbook)
-pushd ${HOME}
-git clone git@github.com:Talligent/openbook-v4-installer.git
-sudo rsync -aq --delete --exclude=.git /root/openbook_build/ansible/ openbook-v4-installer/
-sudo chown -R jenkins: openbook-v4-installer
-pushd openbook-v4-installer/
-git add -A
-git commit -a -m "autocommit $(date)"
-git push
-popd
-popd
-
-exit 0
diff --git a/jjb/.gitignore b/jjb/.gitignore
new file mode 100644
index 0000000..cfe5767
--- /dev/null
+++ b/jjb/.gitignore
@@ -0,0 +1,2 @@
+pippiandcarlos.com.ini
+verizoncloudplatform.com.ini
diff --git a/jjb/example.ini b/jjb/example.ini
new file mode 100644
index 0000000..d87a962
--- /dev/null
+++ b/jjb/example.ini
@@ -0,0 +1,13 @@
+[job_builder]
+ignore_cache=True
+keep_descriptions=False
+include_path=.:scripts:~/git/
+recursive=False
+exclude=.*:manual:./development
+allow_duplicates=False
+
+[jenkins]
+user=my_username
+password=my_jenkins_api_key
+url=http://jenkins.tld/
+query_plugins_info=False
diff --git a/jjb/run.sh b/jjb/run.sh
new file mode 100755
index 0000000..b99ff84
--- /dev/null
+++ b/jjb/run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+ini="${1}"
+jenkins-jobs --conf "${ini}" update --delete-old yaml/
diff --git a/jjb/yaml/build-docker-containers.yaml b/jjb/yaml/build-docker-containers.yaml
new file mode 100644
index 0000000..c005bbd
--- /dev/null
+++ b/jjb/yaml/build-docker-containers.yaml
@@ -0,0 +1,23 @@
+---
+- job:
+    name: build-docker-container
+    display-name: "build-docker-container"
+    project-type: freestyle
+    description: "Runs the saltstack which generates the docker build scripts and ansible playbook installers. Runs the docker build scripts. Pushes the ansible playbooks to git."
+    node: openbook_v4
+    properties:
+      - build-discarder:
+          days-to-keep: 0
+          num-to-keep: 1
+          artifact-days-to-keep: 0
+          artifact-num-to-keep: 0
+    triggers:
+      - timed: "H 0 * * *"
+    scm:
+      - git:
+          url: git@github.com:Talligent/openbook-v4-ci.git
+          branches:
+            - master
+    builders:
+      - shell: |
+          ./build-docker-containers.sh
-- 
cgit v1.3