Skip to content
Snippets Groups Projects
Commit 1860ca8e authored by Tim Jaacks's avatar Tim Jaacks
Browse files

Remove LOG_PREFIX variable

This was used in times when the same code was executed from different
places. We don't do that anymore, so the variable is obsolete.
parent 3d2dbe4d
No related branches found
No related tags found
1 merge request!328Remove LOG_PREFIX variable
Pipeline #78226 skipped with stage
...@@ -39,7 +39,6 @@ build:files: ...@@ -39,7 +39,6 @@ build:files:
timeout: 2m timeout: 2m
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
LOG_PREFIX: "CI:build:"
before_script: before_script:
- !reference [.docker_check] - !reference [.docker_check]
- !reference [.setup_ssh] - !reference [.setup_ssh]
......
...@@ -29,7 +29,7 @@ workflow: ...@@ -29,7 +29,7 @@ workflow:
# CI/CD variable GITLAB_PRIVATE_KEY of the manifest repository. The public key has # CI/CD variable GITLAB_PRIVATE_KEY of the manifest repository. The public key has
# been added as a deploy key in GitLab's repository settings for all contained # been added as a deploy key in GitLab's repository settings for all contained
# repositories. # repositories.
- echo "${LOG_PREFIX} Setup SSH" - echo "Setup SSH"
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- echo "$GITLAB_PRIVATE_KEY" | tr -d '\r' | ssh-add - - echo "$GITLAB_PRIVATE_KEY" | tr -d '\r' | ssh-add -
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
...@@ -46,7 +46,7 @@ workflow: ...@@ -46,7 +46,7 @@ workflow:
- echo "$SSH_CONFIG" > ~/.ssh/config - echo "$SSH_CONFIG" > ~/.ssh/config
.repo_checkout: &repo_checkout .repo_checkout: &repo_checkout
- echo "${LOG_PREFIX} Perform repo checkout" - echo "Perform repo checkout"
- cd ${CI_PROJECT_DIR} - cd ${CI_PROJECT_DIR}
- repo init --submodules -u ${CI_REPOSITORY_URL} - repo init --submodules -u ${CI_REPOSITORY_URL}
-b refs/pipelines/${CI_PIPELINE_ID} -b refs/pipelines/${CI_PIPELINE_ID}
...@@ -59,7 +59,7 @@ workflow: ...@@ -59,7 +59,7 @@ workflow:
SRCREVS_FILE="${CI_PROJECT_DIR}/${IMAGE_PATH}/BUILD_SRCREVS.log" SRCREVS_FILE="${CI_PROJECT_DIR}/${IMAGE_PATH}/BUILD_SRCREVS.log"
if [ -d "$( dirname "${SRCREVS_FILE}" )" ];then if [ -d "$( dirname "${SRCREVS_FILE}" )" ];then
buildhistory-collect-srcrevs > ${SRCREVS_FILE} buildhistory-collect-srcrevs > ${SRCREVS_FILE}
echo "${LOG_PREFIX} buildhistory-collect-srcrevs:" echo "buildhistory-collect-srcrevs:"
cat ${SRCREVS_FILE} cat ${SRCREVS_FILE}
fi fi
...@@ -98,16 +98,16 @@ workflow: ...@@ -98,16 +98,16 @@ workflow:
.build_script: &build_script .build_script: &build_script
# setup build environment # setup build environment
- echo "${LOG_PREFIX} Build configuration MACHINE=${MACHINE} - echo "Build configuration MACHINE=${MACHINE}
DISTRO=${YOCTO_DISTRO} IMAGE=${YOCTO_IMAGE}" DISTRO=${YOCTO_DISTRO} IMAGE=${YOCTO_IMAGE}"
- echo "${LOG_PREFIX} Using build dir ${BUILD_PATH}" - echo "Using build dir ${BUILD_PATH}"
- export MACHINE="${MACHINE}" - export MACHINE="${MACHINE}"
- export DISTRO="${YOCTO_DISTRO}" - export DISTRO="${YOCTO_DISTRO}"
- export EULA="1" - export EULA="1"
- source ./"${SETUP_SCRIPT}" "${BUILD_PATH}" - source ./"${SETUP_SCRIPT}" "${BUILD_PATH}"
# start build # start build
- echo -e "section_start:`date +%s`:bitbake_run\r\e[0KBitbake Log" - echo -e "section_start:`date +%s`:bitbake_run\r\e[0KBitbake Log"
- echo "${LOG_PREFIX} bitbake ${YOCTO_IMAGE} -c ${BITBAKE_TASK}" - echo "bitbake ${YOCTO_IMAGE} -c ${BITBAKE_TASK}"
- bitbake "${YOCTO_IMAGE}" -c "${BITBAKE_TASK}" - bitbake "${YOCTO_IMAGE}" -c "${BITBAKE_TASK}"
- echo -e "section_end:`date +%s`:bitbake_run\r\e[0K" - echo -e "section_end:`date +%s`:bitbake_run\r\e[0K"
...@@ -210,7 +210,6 @@ workflow: ...@@ -210,7 +210,6 @@ workflow:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
SETUP_SCRIPT: "setup-environment" SETUP_SCRIPT: "setup-environment"
LOG_PREFIX: "CI:build:"
BUILD_PATH: "build-${YOCTO_DISTRO}-${MACHINE}" BUILD_PATH: "build-${YOCTO_DISTRO}-${MACHINE}"
IMAGE_PATH: "${BUILD_PATH}/tmp/deploy/images/${MACHINE}" IMAGE_PATH: "${BUILD_PATH}/tmp/deploy/images/${MACHINE}"
LICENSES_PATH: "${BUILD_PATH}/tmp/deploy/licenses" LICENSES_PATH: "${BUILD_PATH}/tmp/deploy/licenses"
......
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