Skip to content
Snippets Groups Projects
Commit c0590817 authored by Felix Gerking's avatar Felix Gerking
Browse files

Add a global var for artifacts file name

parent 99f0afc6
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,7 @@ variables: ...@@ -8,6 +8,7 @@ variables:
DEPLOYPATH_TEST: "/artifacts/${CI_JOB_ID}/" DEPLOYPATH_TEST: "/artifacts/${CI_JOB_ID}/"
GIT_BASE_URL: "git@${CI_SERVER_HOST}:${CI_PROJECT_ROOT_NAMESPACE}" GIT_BASE_URL: "git@${CI_SERVER_HOST}:${CI_PROJECT_ROOT_NAMESPACE}"
TESTS_GIT_URL: "${GIT_BASE_URL}/yocto/tests.git" TESTS_GIT_URL: "${GIT_BASE_URL}/yocto/tests.git"
UPLOADED_ARTIFACTS_FILE: "artifacts.txt"
.setup_ssh: &setup_ssh .setup_ssh: &setup_ssh
# setup ssh key to access private repos # setup ssh key to access private repos
...@@ -83,7 +84,6 @@ variables: ...@@ -83,7 +84,6 @@ variables:
INSTALLSCRIPTS: "fng-install.sh fngsystem-self-update.sh" INSTALLSCRIPTS: "fng-install.sh fngsystem-self-update.sh"
BITBAKE_TASK: "build" BITBAKE_TASK: "build"
UPLOAD_ARTIFACTS: "${BUILDPATH}/${IMAGEPATH}/*" UPLOAD_ARTIFACTS: "${BUILDPATH}/${IMAGEPATH}/*"
UPLOAD_ARTIFACTS_FILE: "artifacts.txt"
before_script: before_script:
- *setup_ssh - *setup_ssh
- *repo_checkout - *repo_checkout
...@@ -95,7 +95,7 @@ variables: ...@@ -95,7 +95,7 @@ variables:
artifacts: artifacts:
paths: paths:
- "${BUILDPATH}/${LICENSESPATH}/**/license.manifest" - "${BUILDPATH}/${LICENSESPATH}/**/license.manifest"
- "${UPLOAD_ARTIFACTS_FILE}" - "${UPLOADED_ARTIFACTS_FILE}"
reports: reports:
dotenv: build.env dotenv: build.env
...@@ -163,36 +163,28 @@ variables: ...@@ -163,36 +163,28 @@ variables:
.artifacts_upload: .artifacts_upload:
variables: variables:
UPLOAD_ARTIFACTS: "" UPLOAD_ARTIFACTS: ""
UPLOAD_ARTIFACTS_FILE: "artifacts.txt"
after_script: after_script:
- | - |
echo "#### Upload Artifacts" echo "#### Upload Artifacts"
UPLOADED_ARTIFACTS=$(find ${UPLOAD_ARTIFACTS} -type f) UPLOADED_ARTIFACTS=$(find ${UPLOAD_ARTIFACTS} -type f)
echo "Upload: ${UPLOADED_ARTIFACTS}" echo "Upload: ${UPLOADED_ARTIFACTS}"
#echo "UPLOADED_ARTIFACTS=\"${UPLOADED_ARTIFACTS}\"" >> artifacts.env echo "${UPLOADED_ARTIFACTS}" >> ${UPLOADED_ARTIFACTS_FILE}
#echo "UPLOADED_ARTIFACTS=TEST123" > artifacts.env while IFS='' read -r LINE || [ -n "${LINE}" ]; do
echo "${UPLOADED_ARTIFACTS}" >> ${UPLOAD_ARTIFACTS_FILE} echo "Upload: ${LINE}"
#echo "UPLOADED_ARTIFACTS=\"${UPLOADED_ARTIFACTS}\"" >> build.env done < ${UPLOADED_ARTIFACTS_FILE}
echo "Show artifacts.txt
cat artifacts.txt
artifacts: artifacts:
paths: paths:
- "artifacts.txt" - ${UPLOADED_ARTIFACTS_FILE}
.artifacts_download: .artifacts_download:
variables:
DOWNLOAD_ARTIFACTS: ""
before_script: before_script:
- | - |
echo "#### Download Artifacts" echo "#### Download Artifacts"
echo "Download: ${DOWNLOAD_ARTIFACTS}"
#[ -e artifacts.env ] && source artifacts.env && echo "Source artifacts.env ok"
echo "Cat artifacts.txt" echo "Cat artifacts.txt"
cat artifacts.txt || echo "artifacts.txt not found" cat ${UPLOADED_ARTIFACTS_FILE} || echo "artifacts.txt not found"
echo "Available artifacts: ${UPLOADED_ARTIFACTS}" while IFS='' read -r LINE || [ -n "${LINE}" ]; do
printenv echo "Dowload: ${LINE}"
#[ -e build.env ] && source build.env && echo "Source build.env ok" done < ${UPLOADED_ARTIFACTS_FILE}
#printenv
.prepare_test: .prepare_test:
before_script: before_script:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment