aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2022-05-06 15:10:36 +0000
committerMaxim Kuvyrkov <maxim.kuvyrkov@linaro.org>2022-05-06 15:10:36 +0000
commit034a1bb4c22499c8615a0fb1434afb27790b2b2a (patch)
treec15c9ab274058e9a7c7059f2d148ef529d8b2430
parent73f69da4fde534952b598f40facdb197d5a7067d (diff)
ci-dockerfile*: Fix http download
"wget URL > FILE" first creates an empty FILE, and then downloads URL into URL.1 file. Use script-friendly curl instead. Change-Id: I689b46dbe4e43a84ed47960692e387640a8c885a
-rw-r--r--ci-dockerfile-build-test.yaml2
-rw-r--r--ci-dockerfile-build.yaml2
-rw-r--r--ci-dockerfiles-deployment.yaml2
-rw-r--r--ci-dockerfiles-sanity-check.yaml2
4 files changed, 4 insertions, 4 deletions
diff --git a/ci-dockerfile-build-test.yaml b/ci-dockerfile-build-test.yaml
index c933c323ee..bdea8134f8 100644
--- a/ci-dockerfile-build-test.yaml
+++ b/ci-dockerfile-build-test.yaml
@@ -39,7 +39,7 @@
builders:
- shell: |
#!/bin/bash -e
- wget https://ci.linaro.org/jenkins/userContent/config.json > ${WORKSPACE}/config.json
+ curl -o ${WORKSPACE}/config.json https://ci.linaro.org/jenkins/userContent/config.json --fail
- shell:
!include-raw: ci-dockerfiles-deployment/build-image-test.sh
publishers:
diff --git a/ci-dockerfile-build.yaml b/ci-dockerfile-build.yaml
index e2213488cf..264230c59d 100644
--- a/ci-dockerfile-build.yaml
+++ b/ci-dockerfile-build.yaml
@@ -37,7 +37,7 @@
builders:
- shell: |
#!/bin/bash -e
- wget https://ci.linaro.org/jenkins/userContent/config.json > ${WORKSPACE}/config.json
+ curl -o ${WORKSPACE}/config.json https://ci.linaro.org/jenkins/userContent/config.json --fail
- shell:
!include-raw: ci-dockerfiles-deployment/build-image.sh
publishers:
diff --git a/ci-dockerfiles-deployment.yaml b/ci-dockerfiles-deployment.yaml
index d2b05354f2..838893da9c 100644
--- a/ci-dockerfiles-deployment.yaml
+++ b/ci-dockerfiles-deployment.yaml
@@ -68,7 +68,7 @@
builders:
- shell: |
#!/bin/bash -e
- wget https://ci.linaro.org/jenkins/userContent/config.json > ${WORKSPACE}/config.json
+ curl -o ${WORKSPACE}/config.json https://ci.linaro.org/jenkins/userContent/config.json --fail
- shell: |
#!/bin/bash -e
echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
diff --git a/ci-dockerfiles-sanity-check.yaml b/ci-dockerfiles-sanity-check.yaml
index 0dec862d78..b716d93e51 100644
--- a/ci-dockerfiles-sanity-check.yaml
+++ b/ci-dockerfiles-sanity-check.yaml
@@ -67,7 +67,7 @@
echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
- shell: |
#!/bin/bash -e
- wget https://ci.linaro.org/jenkins/userContent/config.json > ${WORKSPACE}/config.json
+ curl -o ${WORKSPACE}/config.json https://ci.linaro.org/jenkins/userContent/config.json --fail
- build-name-setter:
name: 'version.txt'
file: true