diff --git a/setup-pj-trigger.sh b/setup-pj-trigger.sh new file mode 100644 index 0000000..024f6cc --- /dev/null +++ b/setup-pj-trigger.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +set -u +echo "Triggering the next prow job using git commit" + +TRACKING_REPO=${REPO_OWNER}/${REPO_NAME} +while getopts ":r:" option; do + case "${option}" in + r) + TRACKING_REPO=${OPTARG} + ;; + esac +done +shift $((OPTIND-1)) + +TRACKING_BRANCH=prow-job-tracking +FILE_TO_PUSH=job/${JOB_NAME} + +cd ${PATH_SCRIPTS} +./trigger-prow-job-from-git.sh -r ${TRACKING_REPO} \ +-b ${TRACKING_BRANCH} -s ${PWD}/env/date.list -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/trigger-prow-job-from-git.sh b/trigger-prow-job-from-git.sh index 3e1cb63..8bbdeb1 100755 --- a/trigger-prow-job-from-git.sh +++ b/trigger-prow-job-from-git.sh @@ -12,7 +12,7 @@ set -eu display_usage() { echo "Usage: -r -b -s -d " echo "Example:" - echo " trigger-prow-job-from-git.sh -r alunsin/docker-ce-build" \ + echo " trigger-prow-job-from-git.sh -r ppc64le-cloud/docker-ce-build" \ "-b prow-job-tracking -s $PWD/env/date.list -d job/postsubmit-build-docker" exit 2 } diff --git a/upstream-master-ci/info.sh b/upstream-master-ci/info.sh index 2511b62..40c12d0 100644 --- a/upstream-master-ci/info.sh +++ b/upstream-master-ci/info.sh @@ -24,5 +24,6 @@ rm -f ${DIR_LOGS_COS}/info.log && touch ${DIR_LOGS_COS}/info.log docker version 2>&1 | tee -a "${DIR_LOGS_COS}/info.log" docker info 2>&1 | tee -a "${DIR_LOGS_COS}/info.log" curl -fsSL -o ${PWD}/check-config.sh "https://raw.githubusercontent.com/moby/moby/master/contrib/check-config.sh" 2>&1 | tee -a "${DIR_LOGS_COS}/info.log" +set -o pipefail bash ${PWD}/check-config.sh 2>&1 | tee -a "${DIR_LOGS_COS}/info.log" || true -exit 0 \ No newline at end of file +exit $? \ No newline at end of file diff --git a/upstream-master-ci/prow-build-dev-image.sh b/upstream-master-ci/prow-build-dev-image.sh index 2c04bf0..0e2323f 100644 --- a/upstream-master-ci/prow-build-dev-image.sh +++ b/upstream-master-ci/prow-build-dev-image.sh @@ -6,8 +6,6 @@ echo "${PATH_CI}" export PATH_CI echo "Prow Job to run CI tests on the Docker packages" -echo "Skip Build Dev image" -exit 0 # Go to the workdir echo "* Starting dockerd and waiting for it *" ${PWD}/dockerctl.sh start diff --git a/upstream-master-ci/prow-info-docker.sh b/upstream-master-ci/prow-info-docker.sh index 3d6db99..7c625a2 100644 --- a/upstream-master-ci/prow-info-docker.sh +++ b/upstream-master-ci/prow-info-docker.sh @@ -4,6 +4,9 @@ set -u # Path to the scripts PATH_CI="${PWD}/upstream-master-ci" export PATH_CI +DATE=`date +%d%m%y-%H%M` + +echo DATE=\"${DATE}\" 2>&1 | tee ${PATH_SCRIPTS}/env/date.list echo "Prow Job to run CI tests on the Docker packages" @@ -14,4 +17,12 @@ echo "** Set up (env files) **" chmod ug+x ${PATH_CI}/get-env-ci.sh && ${PATH_CI}/get-env-ci.sh echo "*** Check Config ***" -chmod ug+x ${PATH_CI}/info.sh && ${PATH_CI}/info.sh \ No newline at end of file +chmod ug+x ${PATH_CI}/info.sh +${PATH_CI}/info.sh + +if [[ $? == 0 ]]; then + ./setup-pj-trigger.sh -r ppc64le-cloud/docker-ce-build +else + echo "The kernel is not suitable to run Docker." + exit 1 +fi diff --git a/upstream-master-ci/prow-integration-tests.sh b/upstream-master-ci/prow-integration-tests.sh index 8f809be..84b472f 100644 --- a/upstream-master-ci/prow-integration-tests.sh +++ b/upstream-master-ci/prow-integration-tests.sh @@ -4,8 +4,6 @@ set -u begin=$SECONDS echo "Prow Job to run integration tests on the Docker packages" -echo "Skip integration tests" -exit 0 ${PWD}/dockerctl.sh start set -o allexport diff --git a/upstream-master-ci/prow-unit-test-docker.sh b/upstream-master-ci/prow-unit-test-docker.sh index 75b654c..5d4bb4c 100644 --- a/upstream-master-ci/prow-unit-test-docker.sh +++ b/upstream-master-ci/prow-unit-test-docker.sh @@ -7,8 +7,6 @@ begin=$SECONDS PATH_CI="${PWD}/upstream-master-ci" export PATH_CI echo "Prow Job to run CI tests on the Docker packages" -echo "Skip unit tests" -exit 0 if [[ -z ${ARTIFACTS} ]]; then ARTIFACTS=/logs/artifacts echo "Setting ARTIFACTS to ${ARTIFACTS}"