diff options
| -rw-r--r-- | jjb/yaml/openbook-database-pipeline.yaml | 88 | ||||
| -rw-r--r-- | jjb/yaml/openbook-pipeline.yaml | 2 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/deploy-dev-env.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/database/files/installdeps.sh | 4 |
4 files changed, 92 insertions, 4 deletions
diff --git a/jjb/yaml/openbook-database-pipeline.yaml b/jjb/yaml/openbook-database-pipeline.yaml new file mode 100644 index 0000000..06d98c5 --- /dev/null +++ b/jjb/yaml/openbook-database-pipeline.yaml @@ -0,0 +1,88 @@ +--- +- job: + name: openbook-database-pipeline + project-type: pipeline + dsl: | + pipeline { + agent { + node { + label "master" + } + } + triggers { + pollSCM 'H/5 * * * *' + } + stages { + stage("docker-container") { + agent { + node { + label "openbook_v4" + customWorkspace "workspace/openbook-database" + } + } + steps { + checkout([ + scm: [ + $class: "GitSCM", + branches: [ + [name: "master"] + ], + userRemoteConfigs: [ + [url: "git@github.com:Talligent/openbook-v4-ci.git"] + ], + poll: false, + changelog: false + ] + ]) + sh(script: "./build-docker-containers.sh database") + } + } + stage("fetch-ansible") { + agent { + node { + label "openbook_v4" + customWorkspace "workspace/openbook-v4-installer" + } + } + steps { + checkout([ + scm: [ + $class: "GitSCM", + branches: [ + [name: "master"] + ], + userRemoteConfigs: [ + [url: "git@github.com:Talligent/openbook-v4-installer.git"] + ], + poll: false, + changelog: false + ] + ]) + } + } + stage("sql-script") { + agent { + node { + label "openbook_v4" + customWorkspace "workspace/openbook-database" + } + } + steps { + checkout([ + scm: [ + $class: "GitSCM", + branches: [ + [name: "master"] + ], + userRemoteConfigs: [ + [url: "git@github.com:Talligent/openbook-database.git"] + ], + poll: true, + changelog: false + ] + ]) + sh(script: "./run-ansible-playbook.sh") + } + } + } + } diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-pipeline.yaml index a1e0ae8..0c5f490 100644 --- a/jjb/yaml/openbook-pipeline.yaml +++ b/jjb/yaml/openbook-pipeline.yaml @@ -64,7 +64,7 @@ sh(script: "ruby openbook/ruby/upload_jar.rb --webdav-url=${{WEBDAV_URL}} --webdav-username=${{WEBDAV_USERNAME}} --webdav-password=${{WEBDAV_PASSWORD}} --artifact={artifact} --version=4.1.${{BUILD_NUMBER}} --filepath=build/libs/{artifact}.4.1.${{BUILD_NUMBER}}.jar") }} }} - stage("docker-containers") {{ + stage("docker-container") {{ steps {{ checkout([ scm: [ diff --git a/salt/openbook/ansible/files/deploy-dev-env.sh b/salt/openbook/ansible/files/deploy-dev-env.sh index c5a4e37..b47774e 100644 --- a/salt/openbook/ansible/files/deploy-dev-env.sh +++ b/salt/openbook/ansible/files/deploy-dev-env.sh @@ -3,7 +3,7 @@ buildroot="$(pwd)" pushd ${buildroot}/conf -cp -v /var/lib/jenkins//env.yaml.openbook . +cp ${HOME}/env.yaml.openbook . rm -f env.yaml ln -s env.yaml.openbook env.yaml popd diff --git a/salt/openbook/database/files/installdeps.sh b/salt/openbook/database/files/installdeps.sh index d752848..678e7d0 100644 --- a/salt/openbook/database/files/installdeps.sh +++ b/salt/openbook/database/files/installdeps.sh @@ -3,10 +3,10 @@ export DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8 -add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu xenial main' +add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu xenial main' apt-get update apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade -apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.1 xinetd +apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.2 xinetd service mysql stop service xinetd stop |