From fc0a7bf0aca48aa6fffd715345779d82d24cbd42 Mon Sep 17 00:00:00 2001 From: Ashwin Hendre Date: Thu, 18 Sep 2025 19:54:19 +0530 Subject: [PATCH] Remove skip-setup-pj-trigger.sh setup-pj-trigger.sh was an intermediate script that served as a bridge between jobs that commit a timestamp and trigger-prow-job-from-git.sh. Its only purpose was to hold the REPO_OWNER and REPO_NAME which can be set in the respective job script itself. --- setup-pj-trigger.sh | 31 -------------------------- upstream-master-ci/prow-info-docker.sh | 14 ++++++++++-- 2 files changed, 12 insertions(+), 33 deletions(-) delete mode 100644 setup-pj-trigger.sh diff --git a/setup-pj-trigger.sh b/setup-pj-trigger.sh deleted file mode 100644 index 796f9245..00000000 --- a/setup-pj-trigger.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - - -TRACKING_REPO=${REPO_OWNER}/${REPO_NAME} -while getopts ":r:s:" option; do - case "${option}" in - r) - TRACKING_REPO=${OPTARG} - ;; - s) - SRC_FILE=${OPTARG} - ;; - esac -done -shift $((OPTIND-1)) - -TRACKING_BRANCH=prow-job-tracking -FILE_TO_PUSH=job/${JOB_NAME} - -echo "Triggering the next prow job by adding a git commit to the \ -${FILE_TO_PUSH} file on the ${TRACKING_BRANCH} branch of the \ -${TRACKING_REPO} repository." - -./trigger-prow-job-from-git.sh -r ${TRACKING_REPO} \ --b ${TRACKING_BRANCH} -s ${SRC_FILE} -d ${FILE_TO_PUSH} - -if [ $? -ne 0 ] -then - echo "Failed to add the git commit to trigger the next job" - exit 3 -fi \ No newline at end of file diff --git a/upstream-master-ci/prow-info-docker.sh b/upstream-master-ci/prow-info-docker.sh index 2737a479..c5166cb1 100644 --- a/upstream-master-ci/prow-info-docker.sh +++ b/upstream-master-ci/prow-info-docker.sh @@ -22,10 +22,20 @@ chmod ug+x ${PATH_CI}/get-env-ci.sh && ${PATH_CI}/get-env-ci.sh echo "*** Check Kernel Config ***" chmod ug+x ${PATH_CI}/info.sh ${PATH_CI}/info.sh +REPO_OWNER=ppc64le-cloud +REPO_NAME=docker-ce-build +TRACKING_REPO=${REPO_OWNER}/${REPO_NAME} +TRACKING_BRANCH=prow-job-tracking +FILE_TO_PUSH=job/${JOB_NAME} if [[ $? == 0 ]]; then - chmod ug+x ./setup-pj-trigger.sh - ./setup-pj-trigger.sh -r ppc64le-cloud/docker-ce-build -s ${PATH_SCRIPTS}/env/date.list + chmod ug+x ./trigger-prow-job-from-git.sh + ./trigger-prow-job-from-git.sh -r ${TRACKING_REPO} \ + -b ${TRACKING_BRANCH} -s ${PWD}/env/date.list -d ${FILE_TO_PUSH} + if [[ $? != 0 ]]; then + echo "Failed to add the git commit to trigger the next job" + exit 3 + fi else if [[ $? == 1 ]]; then echo "Error checking the kernel configuration"