diff --git a/build-pipeline-ci-test.yml b/build-pipeline-ci-test.yml index ed3e3264f0f46ac4b1190c3fc14773fd98bf194c..44a111877ada581b7e864081e487434292697712 100644 --- a/build-pipeline-ci-test.yml +++ b/build-pipeline-ci-test.yml @@ -39,7 +39,6 @@ build:files: timeout: 2m variables: GIT_STRATEGY: none - LOG_PREFIX: "CI:build:" before_script: - !reference [.docker_check] - !reference [.setup_ssh] diff --git a/build-pipeline.yml b/build-pipeline.yml index 0103d888df248fcdae9b37cb5b4ac05304a7d1c6..8931d9c79e681ea32f8d8652a763c542e94958f6 100644 --- a/build-pipeline.yml +++ b/build-pipeline.yml @@ -29,7 +29,7 @@ workflow: # 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 # repositories. - - echo "${LOG_PREFIX} Setup SSH" + - echo "Setup SSH" - eval $(ssh-agent -s) - echo "$GITLAB_PRIVATE_KEY" | tr -d '\r' | ssh-add - - mkdir -p ~/.ssh @@ -46,7 +46,7 @@ workflow: - echo "$SSH_CONFIG" > ~/.ssh/config .repo_checkout: &repo_checkout - - echo "${LOG_PREFIX} Perform repo checkout" + - echo "Perform repo checkout" - cd ${CI_PROJECT_DIR} - repo init --submodules -u ${CI_REPOSITORY_URL} -b refs/pipelines/${CI_PIPELINE_ID} @@ -59,7 +59,7 @@ workflow: SRCREVS_FILE="${CI_PROJECT_DIR}/${IMAGE_PATH}/BUILD_SRCREVS.log" if [ -d "$( dirname "${SRCREVS_FILE}" )" ];then buildhistory-collect-srcrevs > ${SRCREVS_FILE} - echo "${LOG_PREFIX} buildhistory-collect-srcrevs:" + echo "buildhistory-collect-srcrevs:" cat ${SRCREVS_FILE} fi @@ -98,16 +98,16 @@ workflow: .build_script: &build_script # setup build environment - - echo "${LOG_PREFIX} Build configuration MACHINE=${MACHINE} + - echo "Build configuration MACHINE=${MACHINE} DISTRO=${YOCTO_DISTRO} IMAGE=${YOCTO_IMAGE}" - - echo "${LOG_PREFIX} Using build dir ${BUILD_PATH}" + - echo "Using build dir ${BUILD_PATH}" - export MACHINE="${MACHINE}" - export DISTRO="${YOCTO_DISTRO}" - export EULA="1" - source ./"${SETUP_SCRIPT}" "${BUILD_PATH}" # start build - 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}" - echo -e "section_end:`date +%s`:bitbake_run\r\e[0K" @@ -210,7 +210,6 @@ workflow: variables: GIT_STRATEGY: none SETUP_SCRIPT: "setup-environment" - LOG_PREFIX: "CI:build:" BUILD_PATH: "build-${YOCTO_DISTRO}-${MACHINE}" IMAGE_PATH: "${BUILD_PATH}/tmp/deploy/images/${MACHINE}" LICENSES_PATH: "${BUILD_PATH}/tmp/deploy/licenses"