Target uploads to new dropbox address
SSH server which was used to receive file uploads (CI, nightly and release) has been migrated to a new one on a different address. Username, Key and paths are unchanged. Most notable changes are the use of `master.download.kiwix.org` as the target in replacement of `mirror.download.kiwix.org` (although it would still work) and the Port to which SSH is listening on (30022 instead of 22)
This commit is contained in:
parent
4158d75d7a
commit
1351fc7f8b
|
@ -168,8 +168,15 @@ def upload(file_to_upload, host, dest_path):
|
||||||
print_message("No {} to upload!", file_to_upload)
|
print_message("No {} to upload!", file_to_upload)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if ":" in host:
|
||||||
|
host, port = host.split(":", 1)
|
||||||
|
else:
|
||||||
|
port = "22"
|
||||||
|
|
||||||
command = [
|
command = [
|
||||||
"ssh",
|
"ssh",
|
||||||
|
"-p",
|
||||||
|
port,
|
||||||
"-i",
|
"-i",
|
||||||
_environ.get("SSH_KEY"),
|
_environ.get("SSH_KEY"),
|
||||||
"-o",
|
"-o",
|
||||||
|
@ -182,6 +189,8 @@ def upload(file_to_upload, host, dest_path):
|
||||||
|
|
||||||
command = [
|
command = [
|
||||||
"scp",
|
"scp",
|
||||||
|
"-P",
|
||||||
|
port,
|
||||||
"-i",
|
"-i",
|
||||||
_environ.get("SSH_KEY"),
|
_environ.get("SSH_KEY"),
|
||||||
"-o",
|
"-o",
|
||||||
|
@ -195,10 +204,10 @@ def upload(file_to_upload, host, dest_path):
|
||||||
|
|
||||||
def upload_archive(archive, project, make_release):
|
def upload_archive(archive, project, make_release):
|
||||||
if project.startswith("kiwix-") or project in ['libkiwix']:
|
if project.startswith("kiwix-") or project in ['libkiwix']:
|
||||||
host = "ci@download.kiwix.org"
|
host = "ci@master.download.kiwix.org:30022"
|
||||||
dest_path = "/data/download/"
|
dest_path = "/data/download/"
|
||||||
else:
|
else:
|
||||||
host = "ci@download.openzim.org"
|
host = "ci@download.openzim.org:30022"
|
||||||
dest_path = "/data/openzim/"
|
dest_path = "/data/openzim/"
|
||||||
|
|
||||||
if make_release:
|
if make_release:
|
||||||
|
|
|
@ -32,5 +32,5 @@ else:
|
||||||
for target in TARGETS:
|
for target in TARGETS:
|
||||||
run_kiwix_build(target, platform=PLATFORM_TARGET, build_deps_only=True)
|
run_kiwix_build(target, platform=PLATFORM_TARGET, build_deps_only=True)
|
||||||
archive_file = make_deps_archive(target=target)
|
archive_file = make_deps_archive(target=target)
|
||||||
upload(archive_file, "ci@tmp.kiwix.org", "/data/tmp/ci")
|
upload(archive_file, "ci@tmp.kiwix.org:30022", "/data/tmp/ci")
|
||||||
os.remove(str(archive_file))
|
os.remove(str(archive_file))
|
||||||
|
|
|
@ -69,5 +69,5 @@ except URLError:
|
||||||
else:
|
else:
|
||||||
run_kiwix_build("alldependencies", platform=PLATFORM_TARGET)
|
run_kiwix_build("alldependencies", platform=PLATFORM_TARGET)
|
||||||
archive_file = make_deps_archive(name=base_dep_archive_name, full=True)
|
archive_file = make_deps_archive(name=base_dep_archive_name, full=True)
|
||||||
upload(archive_file, "ci@tmp.kiwix.org", "/data/tmp/ci")
|
upload(archive_file, "ci@tmp.kiwix.org:30022", "/data/tmp/ci")
|
||||||
os.remove(str(archive_file))
|
os.remove(str(archive_file))
|
||||||
|
|
|
@ -9,7 +9,7 @@ tar -czf ${ARCHIVE_NAME} $HOME/BUILD_* $HOME/SOURCE $HOME/LOGS $HOME/TOOLCHAINS
|
||||||
|
|
||||||
echo "Uploading archive $ARCHIVE_NAME"
|
echo "Uploading archive $ARCHIVE_NAME"
|
||||||
|
|
||||||
scp -p -i ${SSH_KEY} \
|
scp -P 30022 -p -i ${SSH_KEY} \
|
||||||
-o PasswordAuthentication=no \
|
-o PasswordAuthentication=no \
|
||||||
-o StrictHostKeyChecking=no \
|
-o StrictHostKeyChecking=no \
|
||||||
$ARCHIVE_NAME \
|
$ARCHIVE_NAME \
|
||||||
|
|
|
@ -5,7 +5,7 @@ ARCHIVE_NAME="deps_windows_windows.zip"
|
||||||
SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key
|
SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key
|
||||||
|
|
||||||
7z a -tzip $ARCHIVE_NAME $MINGW64_EXTRA_DIR
|
7z a -tzip $ARCHIVE_NAME $MINGW64_EXTRA_DIR
|
||||||
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
|
scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
|
||||||
${ARCHIVE_NAME} \
|
${ARCHIVE_NAME} \
|
||||||
ci@tmp.kiwix.org:/data/tmp/ci
|
ci@tmp.kiwix.org:/data/tmp/ci
|
||||||
|
|
||||||
|
|
|
@ -7,15 +7,15 @@ SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key
|
||||||
|
|
||||||
if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]]
|
if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]]
|
||||||
then
|
then
|
||||||
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
|
scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
|
||||||
${NIGHTLY_KIWIX_ARCHIVES_DIR} \
|
${NIGHTLY_KIWIX_ARCHIVES_DIR} \
|
||||||
ci@download.kiwix.org:/data/download/nightly
|
ci@master.download.kiwix.org:/data/download/nightly
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$APPVEYOR_REPO_TAG" = "true" ]]
|
if [[ "$APPVEYOR_REPO_TAG" = "true" ]]
|
||||||
then
|
then
|
||||||
RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f)
|
RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f)
|
||||||
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
|
scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
|
||||||
${RELEASE_ARCHIVES} \
|
${RELEASE_ARCHIVES} \
|
||||||
ci@download.kiwix.org:/data/download/release/kiwix-desktop
|
ci@master.download.kiwix.org:/data/download/release/kiwix-desktop
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue