Revert "Workaround for Bug 1262"
This reverts commit c3a33005ded347572dcf09d49df469ac88a67db7.
Reason for revert: LW-UI has been updated via these changes:
https://osm.etsi.org/gerrit/c/osm/devops/+/9851
https://osm.etsi.org/gerrit/c/osm/LW-UI/+/9829
Change-Id: I3a53718237bc7318e9caf2a56e72b12fa9db8a7b
Signed-off-by: beierlm <mark.beierl@canonical.com>
diff --git a/docker/Makefile b/docker/Makefile
index ac5a401..a3b4028 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -14,6 +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 PLA tests
-SUBDIRS = MON NBI osmclient RO LCM POL Keystone NG-UI PLA tests
+SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone NG-UI PLA tests
include mk/dirs.mk
diff --git a/docker/mk/Makefile.include b/docker/mk/Makefile.include
index f8e34c5..e151748 100644
--- a/docker/mk/Makefile.include
+++ b/docker/mk/Makefile.include
@@ -34,8 +34,7 @@
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 ngui PLA tests
+DEPS := MON IM LCM RO common osmclient devops NBI policy-module Keystone N2VC lightui ngui PLA tests
DEPS_TARGETS = $(addprefix $(MKBUILD)/.dep_, $(DEPS))
@@ -47,8 +46,8 @@
$(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 > $@