From 4fd9f5a24bfc1ffc858b070da4526d7ac61c53f8 Mon Sep 17 00:00:00 2001 From: zachmann Date: Tue, 26 Nov 2024 11:26:10 +0100 Subject: [PATCH 1/3] debugging --- .gitlab-ci.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 368c7816..589750ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,6 +86,47 @@ package: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin "$DOCKER_REGISTRY" script: - | + echo "### generic-ci -- before-script -- debug info ###################" + echo "CI_PROJECT_PATH: $CI_PROJECT_PATH" + echo "CI_BUILD_REF: $CI_BUILD_REF" + echo "CI_BUILD_REF_NAME: $CI_BUILD_REF_NAME" + echo "CI_JOB_NAME: $CI_JOB_NAME" + echo "CI_COMMIT_REF_NAME: $CI_COMMIT_REF_NAME" + echo "CI_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE" + echo "CI_COMMIT_BRANCH: $CI_COMMIT_BRANCH" + echo "CI_DEFAULT_BRANCH: $CI_DEFAULT_BRANCH" + echo "CI_COMMIT_SHA: $CI_COMMIT_SHA" + echo "" + echo "CI_UPSTREAM_PROJECT_PATH: $CI_UPSTREAM_PROJECT_PATH" + echo "CI_UPSTREAM_BUILD_REF: $CI_UPSTREAM_BUILD_REF" + echo "CI_UPSTREAM_BUILD_REF_NAME: $CI_UPSTREAM_BUILD_REF_NAME" + echo "CI_UPSTREAM_JOB_NAME: $CI_UPSTREAM_JOB_NAME" + echo "CI_UPSTREAM_COMMIT_REF_NAME: $CI_UPSTREAM_COMMIT_REF_NAME" + echo "CI_UPSTREAM_PIPELINE_SOURCE: $CI_UPSTREAM_PIPELINE_SOURCE" + echo "CI_UPSTREAM_COMMIT_BRANCH: >$CI_UPSTREAM_COMMIT_BRANCH<" + echo "CI_UPSTREAM_DEFAULT_BRANCH: $CI_UPSTREAM_DEFAULT_BRANCH" + echo "CI_UPSTREAM_COMMIT_SHA: $CI_UPSTREAM_COMMIT_SHA" + echo "-----" + echo "CI_JOB_ID $CI_JOB_ID" + echo "CI_PROJECT_ID $CI_PROJECT_ID" + echo "RUNNER_TEMP_PROJECT_DIR $RUNNER_TEMP_PROJECT_DIR" + echo "CI_PROJECT_PATH $CI_PROJECT_PATH" + echo "CI_PROJECT_NAMESPACE $CI_PROJECT_NAMESPACE" + echo "-----" + echo "PREREL_BRANCH_NAME: $PREREL_BRANCH_NAME" + echo "ANYBRANCH_RESOLVE_DEPENDENCIES_REPO: $ANYBRANCH_RESOLVE_DEPENDENCIES_REPO" + echo "PREREL_RESOLVE_DEPENDENCIES_REPO: $PREREL_RESOLVE_DEPENDENCIES_REPO" + echo "PREPROD_RESOLVE_DEPENDENCIES_REPO: $PREPROD_RESOLVE_DEPENDENCIES_REPO" + echo "RESOLVE_DEPENDENCIES_REPO: $RESOLVE_DEPENDENCIES_REPO" + echo "REPO_TO_PUBLISH_TO: $REPO_TO_PUBLISH_TO" + echo "DISTRO: ${DISTRO}" + echo "RELEASE: ${RELEASE}" + echo "AGENT_REF: $AGENT_REF" + echo "PLUGIN_REF: $PLUGIN_REF" + echo "-----" + echo "CI_TOOLS: ${CI_TOOLS}" + echo "RUNNER_TEMP_PROJECT_DIR $RUNNER_TEMP_PROJECT_DIR" + echo "### -------------- ##############################################" [[ "$CI_COMMIT_TAG" == "${PREREL_BRANCH_NAME}" ]] && { echo "Running set-prerel-version" .gitlab-ci-scripts/set-prerel-version.sh From 240cbcc1612ac6c737d0fa38ffc2896ccdeccc35 Mon Sep 17 00:00:00 2001 From: zachmann Date: Tue, 26 Nov 2024 12:01:02 +0100 Subject: [PATCH 2/3] debugging --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 589750ec..75ff5463 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,6 +92,7 @@ package: echo "CI_BUILD_REF_NAME: $CI_BUILD_REF_NAME" echo "CI_JOB_NAME: $CI_JOB_NAME" echo "CI_COMMIT_REF_NAME: $CI_COMMIT_REF_NAME" + echo "CI_COMMIT_TAG: $CI_COMMIT_TAG" echo "CI_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE" echo "CI_COMMIT_BRANCH: $CI_COMMIT_BRANCH" echo "CI_DEFAULT_BRANCH: $CI_DEFAULT_BRANCH" From 04f191f73f0bec3f6978ba5ed491010436a237ba Mon Sep 17 00:00:00 2001 From: zachmann Date: Tue, 26 Nov 2024 12:45:33 +0100 Subject: [PATCH 3/3] fix var --- .gitlab-ci.yml | 48 +++--------------------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75ff5463..1f83c68b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,54 +86,12 @@ package: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin "$DOCKER_REGISTRY" script: - | - echo "### generic-ci -- before-script -- debug info ###################" - echo "CI_PROJECT_PATH: $CI_PROJECT_PATH" - echo "CI_BUILD_REF: $CI_BUILD_REF" - echo "CI_BUILD_REF_NAME: $CI_BUILD_REF_NAME" - echo "CI_JOB_NAME: $CI_JOB_NAME" - echo "CI_COMMIT_REF_NAME: $CI_COMMIT_REF_NAME" - echo "CI_COMMIT_TAG: $CI_COMMIT_TAG" - echo "CI_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE" - echo "CI_COMMIT_BRANCH: $CI_COMMIT_BRANCH" - echo "CI_DEFAULT_BRANCH: $CI_DEFAULT_BRANCH" - echo "CI_COMMIT_SHA: $CI_COMMIT_SHA" - echo "" - echo "CI_UPSTREAM_PROJECT_PATH: $CI_UPSTREAM_PROJECT_PATH" - echo "CI_UPSTREAM_BUILD_REF: $CI_UPSTREAM_BUILD_REF" - echo "CI_UPSTREAM_BUILD_REF_NAME: $CI_UPSTREAM_BUILD_REF_NAME" - echo "CI_UPSTREAM_JOB_NAME: $CI_UPSTREAM_JOB_NAME" - echo "CI_UPSTREAM_COMMIT_REF_NAME: $CI_UPSTREAM_COMMIT_REF_NAME" - echo "CI_UPSTREAM_PIPELINE_SOURCE: $CI_UPSTREAM_PIPELINE_SOURCE" - echo "CI_UPSTREAM_COMMIT_BRANCH: >$CI_UPSTREAM_COMMIT_BRANCH<" - echo "CI_UPSTREAM_DEFAULT_BRANCH: $CI_UPSTREAM_DEFAULT_BRANCH" - echo "CI_UPSTREAM_COMMIT_SHA: $CI_UPSTREAM_COMMIT_SHA" - echo "-----" - echo "CI_JOB_ID $CI_JOB_ID" - echo "CI_PROJECT_ID $CI_PROJECT_ID" - echo "RUNNER_TEMP_PROJECT_DIR $RUNNER_TEMP_PROJECT_DIR" - echo "CI_PROJECT_PATH $CI_PROJECT_PATH" - echo "CI_PROJECT_NAMESPACE $CI_PROJECT_NAMESPACE" - echo "-----" - echo "PREREL_BRANCH_NAME: $PREREL_BRANCH_NAME" - echo "ANYBRANCH_RESOLVE_DEPENDENCIES_REPO: $ANYBRANCH_RESOLVE_DEPENDENCIES_REPO" - echo "PREREL_RESOLVE_DEPENDENCIES_REPO: $PREREL_RESOLVE_DEPENDENCIES_REPO" - echo "PREPROD_RESOLVE_DEPENDENCIES_REPO: $PREPROD_RESOLVE_DEPENDENCIES_REPO" - echo "RESOLVE_DEPENDENCIES_REPO: $RESOLVE_DEPENDENCIES_REPO" - echo "REPO_TO_PUBLISH_TO: $REPO_TO_PUBLISH_TO" - echo "DISTRO: ${DISTRO}" - echo "RELEASE: ${RELEASE}" - echo "AGENT_REF: $AGENT_REF" - echo "PLUGIN_REF: $PLUGIN_REF" - echo "-----" - echo "CI_TOOLS: ${CI_TOOLS}" - echo "RUNNER_TEMP_PROJECT_DIR $RUNNER_TEMP_PROJECT_DIR" - echo "### -------------- ##############################################" - [[ "$CI_COMMIT_TAG" == "${PREREL_BRANCH_NAME}" ]] && { + [[ "$CI_COMMIT_BRANCH" == "${PREREL_BRANCH_NAME}" ]] && { echo "Running set-prerel-version" .gitlab-ci-scripts/set-prerel-version.sh } - [[ "$CI_COMMIT_TAG" != "${PREREL_BRANCH_NAME}" ]] && { - [[ "$CI_COMMIT_TAG" != "${CI_DEFAULT_BRANCH}" ]] && { + [[ "$CI_COMMIT_BRANCH" != "${PREREL_BRANCH_NAME}" ]] && { + [[ "$CI_COMMIT_BRANCH" != "${CI_DEFAULT_BRANCH}" ]] && { # we're on a devel branch echo "Running set-devel-version" .gitlab-ci-scripts/set-prerel-version.sh --devstring dev