diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 932cbb9ee70d088221d04f09d30e006be131ea2f..7a3e4cde47e65fd40d50fb30e4ca78d35944149c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ --- variables: DOCKER_IMAGE_TAG: $CI_COMMIT_REF_SLUG - DEBUG_PIPELINE: + CI_DEBUG_TRACE: value: 'false' description: Enable debug information output to the log BUILD_IMAGE: @@ -36,7 +36,7 @@ variables: # include jobs include: - project: $PIPELINE_TEMPLATE_PROJECT - ref: v0.0.9 + ref: v0.0.10 file: - gitlab-ci/common_gitlab-ci.yml - gitlab-ci/docker-image-base_gitlab-ci.yml diff --git a/.gitlab/ci/n1sdp-image-builds.yml b/.gitlab/ci/n1sdp-image-builds.yml index 6eabab40bcd41f4068ce0dd91794f5b6e8d1cbf0..217aa3482fa5a6a9793a1e551ea2a41ea3e59fe9 100644 --- a/.gitlab/ci/n1sdp-image-builds.yml +++ b/.gitlab/ci/n1sdp-image-builds.yml @@ -14,7 +14,7 @@ - export CI_JOB_NAME_SLUG=${CI_JOB_NAME//\//-} - mkdir tmp - j2 .gitlab/ci/templates/image_build.yml.j2 -o tmp/${CI_JOB_NAME_SLUG}.yml; - - if [ "$DEBUG_PIPELINE" == "true" ]; then + - if [ "$CI_DEBUG_TRACE" == "true" ]; then cat tmp/${CI_JOB_NAME_SLUG}.yml; fi needs: diff --git a/.gitlab/ci/templates/image_build.yml.j2 b/.gitlab/ci/templates/image_build.yml.j2 index da2f88719783d405c07c277c7a65f5c7181fd165..081119e6912184d9fa6898388c7184a8efd0f03f 100644 --- a/.gitlab/ci/templates/image_build.yml.j2 +++ b/.gitlab/ci/templates/image_build.yml.j2 @@ -70,11 +70,6 @@ PTest-{{ CI_JOB_NAME_SLUG }}-Complete: extends: .ptest-tests-results needs: - PTest-{{ CI_JOB_NAME_SLUG }} - -PTest-{{ CI_JOB_NAME_SLUG }}-Cancel: - extends: .cancel-lava-job - needs: - - PTest-{{ CI_JOB_NAME_SLUG }} {% endif %} {% endif %} diff --git a/.gitlab/ci/trigger-image-builds.yml b/.gitlab/ci/trigger-image-builds.yml index f3914b30446313602d01b86848256bd91296f63f..3fd9c2323f73575e0ce21bbe58a01d15d3c62257 100644 --- a/.gitlab/ci/trigger-image-builds.yml +++ b/.gitlab/ci/trigger-image-builds.yml @@ -33,7 +33,7 @@ merge_jobs: cat << EOF > ${CI_JOB_FILE} include: - project: $PIPELINE_TEMPLATE_PROJECT - ref: v0.0.9 + ref: v0.0.10 file: - gitlab-ci/common_gitlab-ci.yml - gitlab-ci/lava-test-base_gitlab-ci.yml @@ -50,7 +50,7 @@ merge_jobs: # Add global variables to env file to export in child pipelines - echo "CREATE_JOB_ID=${CI_JOB_ID}" > global_variables.env - cat global_variables.env - - if [ "${DEBUG_PIPELINE}" == "true" ]; then + - if [ "${CI_DEBUG_TRACE}" == "true" ]; then cat ${CI_JOB_FILE}; fi artifacts: diff --git a/.gitlab/ci/yocto-build.yml b/.gitlab/ci/yocto-build.yml index 920e37f67626c8dd005865b20d15a3edb3fd1a7e..1696a21fef747537fa3b4def2a28d1162d319754 100644 --- a/.gitlab/ci/yocto-build.yml +++ b/.gitlab/ci/yocto-build.yml @@ -45,7 +45,7 @@ $DL_DIR $IMAGE_DIR $TOOLCHAIN_DIR - - if [ "$DEBUG_PIPELINE" == "true" ]; then + - if [ "$CI_DEBUG_TRACE" == "true" ]; then env | sort; fi needs: diff --git a/.gitlab/ci/yocto-qa.yml b/.gitlab/ci/yocto-qa.yml index ce8857e466e59adac4bf4544d04e542c34c7322e..8ee28fc15b739b195d242bd68d1ae73d212517b8 100644 --- a/.gitlab/ci/yocto-qa.yml +++ b/.gitlab/ci/yocto-qa.yml @@ -19,7 +19,7 @@ check-layers: DL_DIR: $CACHE_DIR/$CASSINI_RELEASE_ID/yocto-downloads TOOLCHAIN_DIR: $CACHE_DIR/toolchains before_script: - - if [ "$DEBUG_PIPELINE" == "true" ]; then + - if [ "$CI_DEBUG_TRACE" == "true" ]; then env | sort; fi - mkdir -p ~/.ssh