Skip to content

Commit

Permalink
NO-ISSUE: dependabot optimize (openshift#5697)
Browse files Browse the repository at this point in the history
* NO-ISSUE: Dependabot optimize

* NO-ISSUE: dependabot optimize

before adding my tests

MGMT-12996: Part1: Add a utility that updates the current OCP releases in the DB according to a configuration file named RELEASE_SOURCES
  • Loading branch information
eifrach authored and danmanor committed Nov 28, 2023
1 parent 270b38b commit e8df532
Show file tree
Hide file tree
Showing 27 changed files with 2,581 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ REPORTS ?= $(ROOT_DIR)/reports
GO_TEST_FORMAT = pkgname
DEFAULT_RELEASE_IMAGES = $(shell (tr -d '\n\t ' < ${ROOT_DIR}/data/default_release_images.json))
DEFAULT_OS_IMAGES = $(shell (tr -d '\n\t ' < ${ROOT_DIR}/data/default_os_images.json))
DEFAULT_RELEASE_SOURCES = $(shell (tr -d '\n\t ' < ${ROOT_DIR}/data/default_release_sources.json))

# Support all Release/OS images for CI
ifeq ($(CI), true)
Expand All @@ -149,6 +150,7 @@ endif

RELEASE_IMAGES := $(or ${RELEASE_IMAGES},${DEFAULT_RELEASE_IMAGES})
OS_IMAGES := $(or ${OS_IMAGES},${DEFAULT_OS_IMAGES})
RELEASE_SOURCES := $(or ${RELEASE_SOURCES},${DEFAULT_RELEASE_SOURCES})

# Support given Release/OS images.
ifdef OPENSHIFT_VERSION
Expand Down Expand Up @@ -323,7 +325,7 @@ deploy-service-requirements: | deploy-namespace deploy-inventory-service-file
--disk-encryption-support $(DISK_ENCRYPTION_SUPPORT) --hw-requirements '$(subst ",\",$(HW_REQUIREMENTS))' \
--disabled-host-validations "$(DISABLED_HOST_VALIDATIONS)" --disabled-steps "$(DISABLED_STEPS)" \
--enable-org-tenancy $(ENABLE_ORG_TENANCY) --enable-org-based-feature-gate $(ENABLE_ORG_BASED_FEATURE_GATES) \
$(ALLOW_CONVERGED_FLOW_CMD) $(DISABLE_TLS_CMD)
--release-sources '$(subst ",\",$(RELEASE_SOURCES))' $(ALLOW_CONVERGED_FLOW_CMD) $(DISABLE_TLS_CMD)
ifeq ($(MIRROR_REGISTRY_SUPPORT), True)
python3 ./tools/deploy_assisted_installer_configmap_registry_ca.py --target "$(TARGET)" \
--namespace "$(NAMESPACE)" --apply-manifest $(APPLY_MANIFEST) --ca-file-path $(MIRROR_REG_CA_FILE) --registries-file-path $(REGISTRIES_FILE_PATH)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e8df532

Please sign in to comment.