From c16af7fa3ed0db05a98721817e72a17ec8127a5c Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 8 May 2020 14:24:43 +0000 Subject: [PATCH] Adding PLA to CICD for deb package and docker image publication Change-Id: Ia6b3ea177be521858ac67640f8bc831537930444 Signed-off-by: garciadeblas --- docker/Makefile | 2 +- docker/mk/Makefile.include | 3 ++- jenkins/ci-pipelines/ci_stage_3.groovy | 2 +- tools/gen-repo.sh | 15 ++++++++++++++- tools/newtag.sh | 3 ++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index f5056b76..f2c4ec7a 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -14,5 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # -SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone NG-UI +SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone NG-UI PLA include mk/dirs.mk diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include index 609c069c..1369a6d4 100644 --- a/docker/mk/Makefile.include +++ b/docker/mk/Makefile.include @@ -34,7 +34,7 @@ CONTAINER_NAME ?= $(LOWER_MDG) CMD_DOCKER_ARGS ?= -q DOCKER_ARGS = $(CMD_DOCKER_ARGS) -DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui NG-UI +DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui NG-UI PLA DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS)) @@ -66,6 +66,7 @@ build: $(MKBUILD) $(DEPS_TARGETS) --build-arg OSMCLIENT_VERSION==$(shell cat $(MKBUILD)/.dep_osmclient) \ --build-arg NBI_VERSION==$(shell cat $(MKBUILD)/.dep_NBI) \ --build-arg POL_VERSION==$(shell cat $(MKBUILD)/.dep_policy-module) \ + --build-arg PLA_VERSION==$(shell cat $(MKBUILD)/.dep_PLA) \ --build-arg DEVOPS_VERSION==$(shell cat $(MKBUILD)/.dep_devops) \ --build-arg N2VC_VERSION==$(shell cat $(MKBUILD)/.dep_N2VC) \ --build-arg LWUI_VERSION==$(shell cat $(MKBUILD)/.dep_lightui) \ diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy index 627db754..c3c8b95e 100644 --- a/jenkins/ci-pipelines/ci_stage_3.groovy +++ b/jenkins/ci-pipelines/ci_stage_3.groovy @@ -135,7 +135,7 @@ node("${params.NODE}") { // grab all stable upstream builds based on the dir("${RELEASE}") { - def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI", "NG-UI"] + def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI", "NG-UI", "PLA"] for (component in list) { step ([$class: 'CopyArtifact', projectName: "${component}${upstream_main_job}/${GERRIT_BRANCH}"]) diff --git a/tools/gen-repo.sh b/tools/gen-repo.sh index b3329185..24646d17 100755 --- a/tools/gen-repo.sh +++ b/tools/gen-repo.sh @@ -1,4 +1,17 @@ #!/bin/bash +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# function usage() { echo -e "usage: $0 [OPTIONS] BUILD" @@ -39,7 +52,7 @@ function dump_vars() { echo "BUILD_NUMBER: $BUILD_NUMBER" } -MDG_REPOS="RO osmclient openvim SO UI IM devops MON N2VC NBI common" +MDG_REPOS="RO osmclient openvim SO UI IM devops MON N2VC NBI common POL PLA LW-UI NG-UI" IN_REPO="unstable" OUT_REPO="stable" GPGKEY=71C0472C diff --git a/tools/newtag.sh b/tools/newtag.sh index 12a1409c..644120ee 100755 --- a/tools/newtag.sh +++ b/tools/newtag.sh @@ -14,6 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + if [ $# -ne 5 ]; then echo "Usage $0 " echo "Example: $0 all master v4.0.2 garciadeblas FOUR" @@ -28,7 +29,7 @@ RELEASE_NAME="$5" tag_header="OSM Release $RELEASE_NAME:" tag_message="$tag_header version $TAG" -modules="common devops IM LCM LW-UI MON N2VC NBI openvim osmclient RO vim-emu POL NG-UI" +modules="common devops IM LCM LW-UI MON N2VC NBI openvim osmclient RO vim-emu POL NG-UI PLA" list="" for i in $modules; do if [ "$1" == "$i" -o "$1" == "all" ]; then -- 2.25.1