Update CI code for python3 on host and zenoss.modelindex component change.

Author: jpeacock-zenoss

ci/makefile

@@ -19,18 +19,17 @@ get_component_name = $(subst .tar,,$(subst -0-py2-none-any,,$(notdir $(basename
 COMPONENTS_DIR = prodbin/components
 COMPONENT_FILES = \
 	extjs.tgz \
-	modelindex.tgz \
 	libsmi.deb \
 	penparser-0-py2-none-any.whl \
 	pydeps.tgz \
 	pynetsnmp-0-py2-none-any.whl \
 	service-migration-0-py2-none-any.whl \
+	zenoss.modelindex-0-py2-none-any.whl \
 	zenoss.protocols-0-py2-none-any.whl \
 	zenoss.toolbox-0-py2-none-any.whl \
 	zensocket.tgz
 COMPONENTS = $(addprefix $(COMPONENTS_DIR)/,$(COMPONENT_FILES))
 COMPONENT_VERSIONS = $(ASSEMBLY_PATH)/component_versions.json
-MODELINDEX_WHL = $(COMPONENTS_DIR)/zenoss.modelindex-0-py2-none-any.whl
 
 ZENOSS_WHL = $(COMPONENTS_DIR)/zenoss-0-py2-none-any.whl
 ZENOSS_SRC = $(shell ls -t ../dist/*.whl | head -1)
@@ -48,7 +47,6 @@ DEPENDENCIES = \
 	$(DOCKERFILE) \
 	mariadb/initdb.d/zodb.sql.gz \
 	$(COMPONENTS) \
-	$(MODELINDEX_WHL) \
 	$(ZENOSS_WHL) \
 	$(SOLR_FILES) \
 	prodbin/hubpasswd \
@@ -88,16 +86,13 @@ $(DOCKERFILE): $(DOCKERFILE).in prodbin/packages.txt ../VERSION
 		-e 's|%UID%|$(ZENOSS_UID)|' \
 		- > $@
 
-$(SOLR_FILES): $(COMPONENTS_DIR)/modelindex.tgz | $(SOLR_FILES_DIR)
-	@tar xf $< -C $(SOLR_FILES_DIR)/ --strip-components=6 $(addprefix $(SOLR_TAR_PATH)/,$(notdir $@))
+$(SOLR_FILES): $(COMPONENTS_DIR)/zenoss.modelindex-0-py2-none-any.whl | $(SOLR_FILES_DIR)
+	@unzip -j $< $(addprefix $(SOLR_TAR_PATH)/,$(notdir $@)) -d $(SOLR_FILES_DIR)/
 
 mariadb/initdb.d/zodb.sql.gz: | mariadb/initdb.d
 mariadb/initdb.d/zodb.sql.gz: ../src/Products/ZenModel/data/zodb.sql.gz
 	@cp $< $@
 
-$(MODELINDEX_WHL): $(COMPONENTS_DIR)/modelindex.tgz
-	@tar -xz -C $(COMPONENTS_DIR)/ -f $< --strip-components=1 --wildcards --transform="s/-[0-9.]\+-/-0-/" dist/zenoss.modelindex*.whl
-
 $(ZENOSS_WHL): $(ZENOSS_SRC)
 	@cp $< $@
 

javascript.mk

@@ -7,12 +7,12 @@ JSB_FILE = $(JS_BASEDIR)/builder.jsb2
 # JS_DEPLOYPATH - the output directory relative to the repo root;
 # e.g. src/Products/ZenUI3/browser/resources/deploy
 #
-JS_DEPLOYPATH = $(JS_BASEDIR)/$(shell python2 -c "import json; print json.load(open('$(JSB_FILE)'))['deployDir']")
+JS_DEPLOYPATH = $(JS_BASEDIR)/$(shell python -c "import json; print(json.load(open('$(JSB_FILE)'))['deployDir'])")
 
 BUILDJS_COMMAND_ARGS = -d $(JS_BASEDIR)
 
 # Dependencies for compilation
-JSB_SOURCES = $(shell python2 -c "import json, os.path; print ' '.join(os.path.join('$(JS_BASEDIR)', e['path'], e['text']) for e in json.load(open('$(JSB_FILE)'))['pkgs'][0]['fileIncludes'])")
+JSB_SOURCES = $(shell python -c "import json, os.path; print(' '.join(os.path.join('$(JS_BASEDIR)', e['path'], e['text']) for e in json.load(open('$(JSB_FILE)'))['pkgs'][0]['fileIncludes']))")
 
 JSB_TARGETS = $(JS_DEPLOYPATH)/zenoss-compiled.js $(JS_DEPLOYPATH)/zenoss-compiled-debug.js