Skip to content

Commit ab145b4

Browse files
committed
try
1 parent 858a913 commit ab145b4

4 files changed

Lines changed: 3 additions & 14 deletions

File tree

make/test.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ ifeq ($(DEPLOY_LATEST),true)
343343
endif
344344
else
345345
@echo "Installing specific version of the member-operator"
346-
scripts/ci/manage-member-operator.sh -po ${PUBLISH_OPERATOR} -io ${INSTALL_OPERATOR} -mn ${MEMBER_NS} ${MEMBER_REPO_PATH_PARAM} -qn ${QUAY_NAMESPACE} -ds ${DATE_SUFFIX} ${MEMBER_NS_2_PARAM} ${FORCED_TAG_PARAM} -pe ${PAIRING_EXEC}
346+
scripts/ci/manage-member-operator.sh -po ${PUBLISH_OPERATOR} -io ${INSTALL_OPERATOR} -mn ${MEMBER_NS} ${MEMBER_REPO_PATH_PARAM} -qn ${QUAY_NAMESPACE} -ds ${DATE_SUFFIX} ${MEMBER_NS_2_PARAM} ${FORCED_TAG_PARAM}
347347
endif
348348

349349
.PHONY: get-and-publish-host-operator
@@ -368,7 +368,7 @@ ifeq ($(DEPLOY_LATEST),true)
368368
${KSCTL_BIN_DIR}ksctl adm install-operator host --kubeconfig "$(or ${KUBECONFIG}, ${HOME}/.kube/config)" --namespace ${HOST_NS} ${KSCTL_INSTALL_TIMEOUT_PARAM} -y
369369
else
370370
@echo "Installing specific version of the host-operator"
371-
scripts/ci/manage-host-operator.sh -po ${PUBLISH_OPERATOR} -io ${INSTALL_OPERATOR} -hn ${HOST_NS} ${HOST_REPO_PATH_PARAM} -ds ${DATE_SUFFIX} -qn ${QUAY_NAMESPACE} ${REG_REPO_PATH_PARAM} ${FORCED_TAG_PARAM} -pe ${PAIRING_EXEC}
371+
scripts/ci/manage-host-operator.sh -po ${PUBLISH_OPERATOR} -io ${INSTALL_OPERATOR} -hn ${HOST_NS} ${HOST_REPO_PATH_PARAM} -ds ${DATE_SUFFIX} -qn ${QUAY_NAMESPACE} ${REG_REPO_PATH_PARAM} ${FORCED_TAG_PARAM}
372372
endif
373373

374374
###########################################################

scripts/ci/manage-host-operator.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ user_help () {
1111
echo "-rr, --reg-repo-path Path to the registration service repo"
1212
echo "-ds, --date-suffix Date suffix to be added to some resources that are created"
1313
echo "-ft, --forced-tag Forces a tag to be set to all built images. In the case deployment the tag is used for index image in the created CatalogSource"
14-
echo "-pe, --pairing-exec Binary path to execute the pairing"
1514
echo "-h, --help To show this help text"
1615
echo ""
1716
exit 0
@@ -69,11 +68,6 @@ read_arguments() {
6968
FORCED_TAG=$1
7069
shift
7170
;;
72-
-pe|--pairing-exec)
73-
shift
74-
PAIRING_EXEC=$1
75-
shift
76-
;;
7771
*)
7872
echo "$1 is not a recognized flag!" >> /dev/stderr
7973
user_help

scripts/ci/manage-member-operator.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ user_help () {
1111
echo "-mr, --member-repo-path Path to the member operator repo"
1212
echo "-ds, --date-suffix Date suffix to be added to some resources that are created"
1313
echo "-ft, --forced-tag Forces a tag to be set to all built images. In the case deployment the tag is used for index image in the created CatalogSource"
14-
echo "-pe, --pairing-exec Binary path to execute the pairing"
1514
echo "-h, --help To show this help text"
1615
echo ""
1716
exit 0
@@ -68,11 +67,6 @@ read_arguments() {
6867
FORCED_TAG=$1
6968
shift
7069
;;
71-
-pe|--pairing-exec)
72-
shift
73-
PAIRING_EXEC=$1
74-
shift
75-
;;
7670
*)
7771
echo "$1 is not a recognized flag!" >> /dev/stderr
7872
user_help

scripts/ci/manage-operator.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ fi
99
WAS_ALREADY_PAIRED_FILE=/tmp/toolchain_e2e_already_paired
1010

1111
get_repo() {
12+
echo PAIRING_EXEC ${PAIRING_EXEC}
1213
if [[ -z ${PROVIDED_REPOSITORY_PATH} ]]; then
1314
REPOSITORY_PATH="/tmp/codeready-toolchain/${REPOSITORY_NAME}"
1415

0 commit comments

Comments
 (0)