Browse code
Move packageWeights from build infra
Change-Id: I7ffdce67f904863e5bae871c43d3c478e8754bfa
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5913
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Alexey Makhalov authored on 2018/10/12 04:50:20Showing 2 changed files
| ... | ... |
@@ -75,9 +75,9 @@ PUBLISH_BUILD_DEPENDENCIES := |
| 75 | 75 |
endif |
| 76 | 76 |
|
| 77 | 77 |
ifdef WEIGHTS |
| 78 |
-PACKAGE_WEIGHTS_PATH = -pw $(WEIGHTS) |
|
| 78 |
+PACKAGE_WEIGHTS = -pw $(SRCROOT)/common/data/packageWeights.json |
|
| 79 | 79 |
else |
| 80 |
-PACKAGE_WEIGHTS_PATH = |
|
| 80 |
+PACKAGE_WEIGHTS = |
|
| 81 | 81 |
endif |
| 82 | 82 |
|
| 83 | 83 |
TOOLS_BIN := $(SRCROOT)/tools/bin |
| ... | ... |
@@ -129,7 +129,7 @@ packages-micro: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOUR |
| 129 | 129 |
-v $(PHOTON_RELEASE_VERSION) \ |
| 130 | 130 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 131 | 131 |
$(PUBLISH_BUILD_DEPENDENCIES) \ |
| 132 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 132 |
+ $(PACKAGE_WEIGHTS) \ |
|
| 133 | 133 |
-t ${THREADS}
|
| 134 | 134 |
|
| 135 | 135 |
live-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) |
| ... | ... |
@@ -165,7 +165,7 @@ packages-minimal: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SO |
| 165 | 165 |
-v $(PHOTON_RELEASE_VERSION) \ |
| 166 | 166 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 167 | 167 |
$(PUBLISH_BUILD_DEPENDENCIES) \ |
| 168 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 168 |
+ $(PACKAGE_WEIGHTS) \ |
|
| 169 | 169 |
-t ${THREADS}
|
| 170 | 170 |
|
| 171 | 171 |
iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES) |
| ... | ... |
@@ -252,7 +252,7 @@ packages: check-docker-py check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $( |
| 252 | 252 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 253 | 253 |
$(PHOTON_KAT_BUILD_FLAGS) \ |
| 254 | 254 |
$(PUBLISH_BUILD_DEPENDENCIES) \ |
| 255 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 255 |
+ $(PACKAGE_WEIGHTS) \ |
|
| 256 | 256 |
-t ${THREADS}
|
| 257 | 257 |
|
| 258 | 258 |
packages-docker: check-docker-py check-docker-service check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists |
| ... | ... |
@@ -276,7 +276,7 @@ packages-docker: check-docker-py check-docker-service check-tools $(PHOTON_STAGE |
| 276 | 276 |
-g $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
| 277 | 277 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 278 | 278 |
$(PUBLISH_BUILD_DEPENDENCIES) \ |
| 279 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 279 |
+ $(PACKAGE_WEIGHTS) \ |
|
| 280 | 280 |
-t ${THREADS}
|
| 281 | 281 |
|
| 282 | 282 |
updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists |
| ... | ... |
@@ -298,7 +298,7 @@ updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_P |
| 298 | 298 |
$(PHOTON_KAT_BUILD_FLAGS) \ |
| 299 | 299 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 300 | 300 |
$(PUBLISH_BUILD_DEPENDENCIES) \ |
| 301 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 301 |
+ $(PACKAGE_WEIGHTS) \ |
|
| 302 | 302 |
-t ${THREADS}
|
| 303 | 303 |
|
| 304 | 304 |
tool-chain-stage1: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists |