From: beierlm <mark.beierl@canonical.com>
Date: Wed, 14 Oct 2020 11:25:16 +0000 (-0400)
Subject: Workaround for Bug 1262
X-Git-Tag: release-v9.0-start~58
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F26%2F9826%2F5;p=osm%2Fdevops.git

Workaround for Bug 1262

Disable the build of light-ui until it can be updated with a newer
version of Ubuntu, Python 3 and NPM.

Change-Id: I6ed11216c4ba71fd784c113342d49bd941349fd3
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/docker/Makefile b/docker/Makefile
index a3b40288..ac5a4010 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -14,5 +14,6 @@
 #   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 PLA tests
+#SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone NG-UI PLA tests
+SUBDIRS = MON NBI osmclient RO LCM POL Keystone NG-UI PLA tests
 include mk/dirs.mk
diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index e1517483..f8e34c53 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -34,7 +34,8 @@ 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 ngui PLA tests
+#DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC ngui PLA tests
 
 DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
 
@@ -46,8 +47,8 @@ $(MKBUILD):
 $(MKBUILD)/.dep_policy-module:
 	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m POL -p policy-module > $@
 
-$(MKBUILD)/.dep_lightui:
-	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m LW-UI -p lightui > $@
+#$(MKBUILD)/.dep_lightui:
+#	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m LW-UI -p lightui > $@
 
 $(MKBUILD)/.dep_ngui:
 	$Q$(MKINCLUDE)/get_version.sh -r $(REPOSITORY) -R $(RELEASE) -k $(REPOSITORY_KEY) -u $(REPOSITORY_BASE) -m NG-UI -p ngui > $@
diff --git a/installers/osm_health.sh b/installers/osm_health.sh
index e7c8065e..995fcd3e 100755
--- a/installers/osm_health.sh
+++ b/installers/osm_health.sh
@@ -16,10 +16,12 @@
 # limitations under the License.
 
 WAIT_TIME=340  # LCM healthcheck needs 2x(30+140) senconds
-SERVICES_WITH_HEALTH="nbi ro zookeeper lcm mon light-ui pol kafka"
+#SERVICES_WITH_HEALTH="nbi ro zookeeper lcm mon light-ui pol kafka"
+SERVICES_WITH_HEALTH="nbi ro zookeeper lcm mon pol kafka"
 NUM_SERVICES_WITH_HEALTH=$(echo $SERVICES_WITH_HEALTH | wc -w)
 WAIT_FINAL=30
-OSM_DEPLOYMENT="light-ui nbi lcm ro mon pol keystone"
+#OSM_DEPLOYMENT="light-ui nbi lcm ro mon pol keystone"
+OSM_DEPLOYMENT="nbi lcm ro mon pol keystone"
 OSM_STATEFULSET="zookeeper kafka mongo mysql prometheus"
 NUM_K8S_PODS=$(echo $OSM_DEPLOYMENT $OSM_STATEFULSET | wc -w)
 
diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index d87ad95b..3ef5a11c 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -143,7 +143,8 @@ 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", "PLA", "tests"]
+                //def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "LW-UI", "NG-UI", "PLA", "tests"]
+                def list = ["RO", "openvim", "osmclient", "IM", "devops", "MON", "N2VC", "NBI", "common", "LCM", "POL", "NG-UI", "PLA", "tests"]
                 for (component in list) {
                     step ([$class: 'CopyArtifact',
                            projectName: "${component}${upstream_main_job}/${GERRIT_BRANCH}"])