diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-27 12:29:16 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-27 12:29:16 -0600 |
| commit | 698926e352294bd167cfe158a71689c8606bce7b (patch) | |
| tree | 71d30a06af185d970101ebd52e40c5938469c895 | |
| parent | dee90ffc700882369589dc3078abbf81e0bb5927 (diff) | |
putting jjb tree in here
| -rw-r--r-- | bootstrap/config.yaml.example | 4 | ||||
| -rwxr-xr-x | build-docker-containers.sh (renamed from ci-script.sh) | 0 | ||||
| -rw-r--r-- | jjb/.gitignore | 2 | ||||
| -rw-r--r-- | jjb/example.ini | 13 | ||||
| -rwxr-xr-x | jjb/run.sh | 4 | ||||
| -rw-r--r-- | jjb/yaml/build-docker-containers.yaml | 23 |
6 files changed, 46 insertions, 0 deletions
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/ci-script.sh b/build-docker-containers.sh index 5627f32..5627f32 100755 --- a/ci-script.sh +++ b/build-docker-containers.sh 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 |