From a8ee14ad90e77d1d6f32f07f2a58e6e01f6681ae Mon Sep 17 00:00:00 2001 From: re2429 Date: Mon, 20 Aug 2018 15:42:56 -0400 Subject: [PATCH] Changes to support building the development branch Updated to address review issues. Change-Id: I8b6c6eb2ef3135b17201e990b7e4478729749f9e Signed-off-by: re2429 --- jjb/addon-onap/addon-onap.yaml | 7 +++++-- .../airshipinabottle_deploy.yaml | 7 +++++-- jjb/camunda_workflow/camunda_workflow-docker.yaml | 7 +++++-- jjb/camunda_workflow/camunda_workflow.yaml | 19 +++++++++++++++++-- .../portal_user_interface-docker.yaml | 7 +++++-- .../portal_user_interface.yaml | 19 +++++++++++++++++-- jjb/postgres_db_schema/postgres_db_schema.yaml | 7 +++++-- jjb/redfish/redfish.yaml | 7 +++++-- jjb/regional_controller/regional_controller.yaml | 7 +++++-- jjb/sample_vnf/sample_vnf.yaml | 7 +++++-- jjb/shell/build-docker.sh | 6 ++++++ jjb/shell/make-tar.sh | 21 ++++++++++++++------- jjb/test_automation/test_automation.yaml | 7 +++++-- jjb/yaml_builds/yaml_builds.yaml | 7 +++++-- 14 files changed, 104 insertions(+), 31 deletions(-) diff --git a/jjb/addon-onap/addon-onap.yaml b/jjb/addon-onap/addon-onap.yaml index e5169f0..2167365 100644 --- a/jjb/addon-onap/addon-onap.yaml +++ b/jjb/addon-onap/addon-onap.yaml @@ -19,11 +19,14 @@ project-name: addon-onap project: addon-onap build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development mvn-settings: addon-onap-settings group-id: org.akraino.addon-onap refspec: refs/heads/master - branch: master jobs: - akraino-project-stream-release-config views: diff --git a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml index 44d6574..f9ea4d5 100644 --- a/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml +++ b/jjb/airshipinabottle_deploy/airshipinabottle_deploy.yaml @@ -19,11 +19,14 @@ project-name: airshipinabottle_deploy project: airshipinabottle_deploy build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development mvn-settings: airshipinabottle_deploy-settings group-id: org.akraino.airshipinabottle_deploy refspec: refs/heads/master - branch: master jobs: - akraino-project-stream-release-config views: diff --git a/jjb/camunda_workflow/camunda_workflow-docker.yaml b/jjb/camunda_workflow/camunda_workflow-docker.yaml index 2d139b3..9bda997 100644 --- a/jjb/camunda_workflow/camunda_workflow-docker.yaml +++ b/jjb/camunda_workflow/camunda_workflow-docker.yaml @@ -20,7 +20,11 @@ project: camunda_workflow global-settings-file: global-settings build-node: ubuntu1604-docker-8c-8g - stream: master + stream: + - master: + branch: master + - development: + branch: development java-version: openjdk8 mvn-version: mvn35 mvn-opts: '' @@ -28,6 +32,5 @@ mvn-settings: camunda_workflow-settings build-timeout: 60 submodule-recursive: true - branch: master jobs: - 'akraino-project-stream-docker' diff --git a/jjb/camunda_workflow/camunda_workflow.yaml b/jjb/camunda_workflow/camunda_workflow.yaml index c5d1b32..808a68f 100644 --- a/jjb/camunda_workflow/camunda_workflow.yaml +++ b/jjb/camunda_workflow/camunda_workflow.yaml @@ -21,9 +21,24 @@ mvn-settings: camunda_workflow-settings mvn-params: '-f akraino/pom.xml' build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development jobs: - '{project-name}-maven-jobs' - - gerrit-maven-sonar views: - common-view + +# Only run Sonar on the development branch +- project: + name: camunda_workflow-sonar-development + project: camunda_workflow + project-name: camunda_workflow + mvn-settings: camunda_workflow-settings + mvn-params: '-f akraino/pom.xml' + build-node: centos7-builder-2c-1g + stream: development + jobs: + - gerrit-maven-sonar diff --git a/jjb/portal_user_interface/portal_user_interface-docker.yaml b/jjb/portal_user_interface/portal_user_interface-docker.yaml index e064c43..6d8168e 100644 --- a/jjb/portal_user_interface/portal_user_interface-docker.yaml +++ b/jjb/portal_user_interface/portal_user_interface-docker.yaml @@ -20,7 +20,11 @@ project: portal_user_interface global-settings-file: global-settings build-node: ubuntu1604-docker-8c-8g - stream: master + stream: + - master: + branch: master + - development: + branch: development java-version: openjdk8 mvn-version: mvn35 mvn-opts: '' @@ -28,6 +32,5 @@ mvn-settings: portal_user_interface-settings build-timeout: 60 submodule-recursive: true - branch: master jobs: - 'akraino-project-stream-docker' diff --git a/jjb/portal_user_interface/portal_user_interface.yaml b/jjb/portal_user_interface/portal_user_interface.yaml index e87ac68..0993b25 100644 --- a/jjb/portal_user_interface/portal_user_interface.yaml +++ b/jjb/portal_user_interface/portal_user_interface.yaml @@ -21,9 +21,24 @@ mvn-settings: portal_user_interface-settings mvn-params: '-f AECPortalMgmt/pom.xml' build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development jobs: - '{project-name}-maven-jobs' - - gerrit-maven-sonar views: - common-view + +# Only run Sonar on the development branch +- project: + name: portal_user_interface-sonar-development + project: portal_user_interface + project-name: portal_user_interface + mvn-settings: portal_user_interface-settings + mvn-params: '-f AECPortalMgmt/pom.xml' + build-node: centos7-builder-2c-1g + stream: development + jobs: + - gerrit-maven-sonar diff --git a/jjb/postgres_db_schema/postgres_db_schema.yaml b/jjb/postgres_db_schema/postgres_db_schema.yaml index 1d5a8ff..590f55e 100644 --- a/jjb/postgres_db_schema/postgres_db_schema.yaml +++ b/jjb/postgres_db_schema/postgres_db_schema.yaml @@ -20,7 +20,11 @@ project: postgres_db_schema global-settings-file: global-settings build-node: ubuntu1604-docker-8c-8g - stream: master + stream: + - master: + branch: master + - development: + branch: development java-version: openjdk8 mvn-version: mvn35 mvn-opts: '' @@ -28,7 +32,6 @@ mvn-settings: postgres_db_schema-settings build-timeout: 60 submodule-recursive: true - branch: master jobs: - 'akraino-project-stream-docker' views: diff --git a/jjb/redfish/redfish.yaml b/jjb/redfish/redfish.yaml index 00dae92..4a38303 100644 --- a/jjb/redfish/redfish.yaml +++ b/jjb/redfish/redfish.yaml @@ -19,11 +19,14 @@ project-name: redfish project: redfish build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development mvn-settings: redfish-settings group-id: org.akraino.redfish refspec: refs/heads/master - branch: master jobs: - akraino-project-stream-release-config views: diff --git a/jjb/regional_controller/regional_controller.yaml b/jjb/regional_controller/regional_controller.yaml index f29f70b..832d7f4 100644 --- a/jjb/regional_controller/regional_controller.yaml +++ b/jjb/regional_controller/regional_controller.yaml @@ -19,11 +19,14 @@ project-name: regional_controller project: regional_controller build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development mvn-settings: regional_controller-settings group-id: org.akraino.regional_controller refspec: refs/heads/master - branch: master jobs: - akraino-project-stream-release-config views: diff --git a/jjb/sample_vnf/sample_vnf.yaml b/jjb/sample_vnf/sample_vnf.yaml index a5e8d88..1cf313f 100644 --- a/jjb/sample_vnf/sample_vnf.yaml +++ b/jjb/sample_vnf/sample_vnf.yaml @@ -19,11 +19,14 @@ project-name: sample_vnf project: sample_vnf build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development mvn-settings: sample_vnf-settings group-id: org.akraino.sample_vnf refspec: refs/heads/master - branch: master jobs: - akraino-project-stream-release-config views: diff --git a/jjb/shell/build-docker.sh b/jjb/shell/build-docker.sh index 53d4faf..7656d28 100644 --- a/jjb/shell/build-docker.sh +++ b/jjb/shell/build-docker.sh @@ -69,6 +69,12 @@ postgres_db_schema) ;; esac +# Append stream, if it is not the master stream +if [ "${STREAM}" != "master" ] +then + VERSION="${VERSION}-${STREAM}" +fi + # Build and push the Docker container docker build -f Dockerfile -t ${CON_NAME}:${VERSION} . docker tag ${CON_NAME}:${VERSION} ${DOCKER_REPO}/${CON_NAME}:${VERSION} diff --git a/jjb/shell/make-tar.sh b/jjb/shell/make-tar.sh index 4c70134..bd282d5 100644 --- a/jjb/shell/make-tar.sh +++ b/jjb/shell/make-tar.sh @@ -18,7 +18,6 @@ sudo yum install -y dos2unix # shellcheck source="$WORKSPACE/version.properties" disable=SC1091 dos2unix "${WORKSPACE}/version.properties" source "$WORKSPACE/version.properties" -TAR_NAME="${PROJECT}-${VERSION}-SNAPSHOT.tgz" TARDIR=$UPLOAD_FILES_PATH set -e -u -x -o pipefail @@ -30,19 +29,27 @@ then # ONAP addon is special. # Build the regional controller scripts tar ball - ARTIFACT_NAME="onap-amsterdam-regional-controller-master" - echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}${VERSION}-SNAPSHOT.tgz" + ARTIFACT_NAME="onap-amsterdam-regional-controller-${STREAM}" + TAR_NAME="${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" + echo "Making tar file ${TARDIR}/${TAR_NAME}" cd ./src/regional_controller_scripts/ - tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- * + tar -cvzf "${TARDIR}/${TAR_NAME}" -- * # Build the ONAP VM scripts tar ball - ARTIFACT_NAME="onap-amsterdam-VM-master" - echo "Making tar file ${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" + ARTIFACT_NAME="onap-amsterdam-VM-${STREAM}" + TAR_NAME="${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" + echo "Making tar file ${TARDIR}/${TAR_NAME}" cd ../onap_vm_scripts/ - tar -cvzf "${TARDIR}/${ARTIFACT_NAME}-${VERSION}-SNAPSHOT.tgz" -- * + tar -cvzf "${TARDIR}/${TAR_NAME}" -- * else + if [ "$STREAM" == "master" ] + then + TAR_NAME="${PROJECT}-${VERSION}-SNAPSHOT.tgz" + else + TAR_NAME="${PROJECT}-${VERSION}-${STREAM}-SNAPSHOT.tgz" + fi echo "Making tar file ${TARDIR}/${TAR_NAME}" tar -cvzf "${TARDIR}/${TAR_NAME}" -- * diff --git a/jjb/test_automation/test_automation.yaml b/jjb/test_automation/test_automation.yaml index 74ebfe7..4f9a170 100644 --- a/jjb/test_automation/test_automation.yaml +++ b/jjb/test_automation/test_automation.yaml @@ -19,11 +19,14 @@ project-name: test_automation project: test_automation build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development mvn-settings: test_automation-settings group-id: org.akraino.test_automation refspec: refs/heads/master - branch: master jobs: - akraino-project-stream-release-config views: diff --git a/jjb/yaml_builds/yaml_builds.yaml b/jjb/yaml_builds/yaml_builds.yaml index d02d1fb..082fcf9 100644 --- a/jjb/yaml_builds/yaml_builds.yaml +++ b/jjb/yaml_builds/yaml_builds.yaml @@ -19,11 +19,14 @@ project-name: yaml_builds project: yaml_builds build-node: centos7-builder-2c-1g - stream: master + stream: + - master: + branch: master + - development: + branch: development mvn-settings: yaml_builds-settings group-id: org.akraino.yaml_builds refspec: refs/heads/master - branch: master jobs: - akraino-project-stream-release-config views: -- 2.16.6