Skip to content

Commit 6b5394e

Browse files
committed
SPS changes for base mq tiggers
1 parent d426fa2 commit 6b5394e

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

Makefile

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,7 @@ downloads/$(MQ_ARCHIVE_DEV):
172172
$(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced for Developers "$(MQ_VERSION)$(END)))
173173
mkdir -p downloads
174174
ifneq "$(BUILD_RSYNC_SERVER)" "$(EMPTY)"
175-
# Use key which is not stored in the repository to fetch the files from the fileserver
176-
curl --fail --location $(BUILD_RSYNC_ENCRYPTED_KEY_URL) --output ./host.key.gpg
177-
@echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --batch --passphrase-fd 0 ./host.key.gpg
178-
chmod 600 ./host.key
179-
rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no -i ./host.key" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE_DEV)
180-
-@rm host.key.gpg host.key
175+
rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE_DEV)
181176
else
182177
ifneq "$(MQ_ARCHIVE_REPOSITORY_DEV)" "$(EMPTY)"
183178
curl --fail --user $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) --request GET "$(MQ_ARCHIVE_REPOSITORY_DEV)" --output downloads/$(MQ_ARCHIVE_DEV)
@@ -190,13 +185,7 @@ downloads/$(MQ_ARCHIVE):
190185
$(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced "$(MQ_VERSION)$(END)))
191186
mkdir -p downloads
192187
ifneq "$(BUILD_RSYNC_SERVER)" "$(EMPTY)"
193-
# Use key which is not stored in the repository to fetch the files from the fileserver
194-
-@rm host.key.gpg host.key
195-
curl --fail --location $(BUILD_RSYNC_ENCRYPTED_KEY_URL) --output ./host.key.gpg
196-
@echo $(BUILD_RSYNC_ENCRYPTION_PASSWORD)|gpg --batch --passphrase-fd 0 ./host.key.gpg
197-
chmod 600 ./host.key
198-
rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no -i ./host.key" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE)
199-
-@rm host.key.gpg host.key
188+
rsync -rv -e "ssh -o BatchMode=yes -q -o StrictHostKeyChecking=no" --include="*/" --include="*.tar.gz" --exclude="*" $(BUILD_RSYNC_USER)@$(BUILD_RSYNC_SERVER):"$(BUILD_RSYNC_PATH)" downloads/$(MQ_ARCHIVE)
200189
else
201190
ifneq "$(MQ_ARCHIVE_REPOSITORY)" "$(EMPTY)"
202191
curl --fail --user $(MQ_ARCHIVE_REPOSITORY_USER):$(MQ_ARCHIVE_REPOSITORY_CREDENTIAL) --request GET "$(MQ_ARCHIVE_REPOSITORY)" --output downloads/$(MQ_ARCHIVE)

0 commit comments

Comments
 (0)