diff options
author | 2018-10-18 18:20:38 +0000 | |
---|---|---|
committer | 2018-10-18 18:20:38 +0000 | |
commit | 5dd0bab482f4740dec66f5a1a1e1dc8b4fef2296 (patch) | |
tree | f2080768cb34c1a9f17aadb737908a266565b8e4 | |
parent | 191260be7c67bea3e59ce27e90dd3cb95463986d (diff) | |
parent | b5aaafd67f2c5e7f2272a98792b39b6ec22df237 (diff) |
Merge "Add ci-management script"
-rwxr-xr-x | lib/_installers | 2 | ||||
-rwxr-xr-x | lib/ci-management | 29 | ||||
-rwxr-xr-x | lib/config/env-vars | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/lib/_installers b/lib/_installers index 52dc20b..939349a 100755 --- a/lib/_installers +++ b/lib/_installers @@ -319,7 +319,7 @@ function install_haproxy { # _install_rancher() - Function that installs Rancher CLI and container function _install_rancher { local rancher_version=v0.6.5 - local rancher_server_version=v1.6.10 + local rancher_server_version=v1.6.14 local rancher_server=rancher/server:$rancher_server_version if [ ! -d /opt/rancher/current ]; then diff --git a/lib/ci-management b/lib/ci-management new file mode 100755 index 0000000..da6df14 --- /dev/null +++ b/lib/ci-management @@ -0,0 +1,29 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2017-2018 +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################# + +source /var/onap/functions + +# init_ci-management() - Init ci-management project +function init_ci-management { + local jenkins_username=${1:-$(git config --get gitreview.username)} + local jenkins_api_token=$2 + + if [[ "$clone_repo" == "True" ]]; then + clone_repos "ci-management" + pushd ${src_folders[ci-management]} + git submodule update --init + uninstall_package python-six + install_python_package jenkins-job-builder + cp jenkins.ini.example jenkins.ini + sed -i "s|user=#username#|user=$jenkins_username|g" jenkins.ini + sed -i "s|password=#api_token#|password=$jenkins_api_token|g" jenkins.ini + popd + fi +} diff --git a/lib/config/env-vars b/lib/config/env-vars index 2cd766f..3cb315c 100755 --- a/lib/config/env-vars +++ b/lib/config/env-vars @@ -19,6 +19,7 @@ src_folders=( ["aai"]="$git_src_folder/aai" ["appc"]="$git_src_folder/appc" ["ccsdk"]="$git_src_folder/ccsdk" +["ci-management"]="$git_src_folder/ci-management" ["dcae"]="$git_src_folder/dcae" ["dmaap"]="$git_src_folder/dmaap" ["integration"]="$git_src_folder/integration" @@ -52,6 +53,7 @@ ccsdk/platform/blueprints ccsdk/platform/nbapi \ ccsdk/platform/plugins ccsdk/sli ccsdk/sli/adaptors ccsdk/sli/core \ ccsdk/sli/northbound ccsdk/sli/plugins ccsdk/storage \ ccsdk/storage/esaas ccsdk/storage/pgaas ccsdk/utils" +["ci-management"]="ci-management" ["dcae"]="dcae dcae/apod dcae/apod/analytics dcae/apod/buildtools \ dcae/apod/cdap dcae/collectors dcae/collectors/ves dcae/controller \ dcae/controller/analytics dcae/dcae-inventory dcae/demo \ |