Skip to content

Commit e2f8d34

Browse files
committed
Enable CI
1 parent 3073c3d commit e2f8d34

File tree

7 files changed

+44
-9
lines changed

7 files changed

+44
-9
lines changed

setup-pj-trigger.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
3+
echo "Triggering the next prow job using git commit"
4+
5+
TRACKING_REPO=${REPO_OWNER}/${REPO_NAME}
6+
while getopts ":r:" option; do
7+
case "${option}" in
8+
r)
9+
TRACKING_REPO=${OPTARG}
10+
;;
11+
esac
12+
done
13+
shift $((OPTIND-1))
14+
15+
TRACKING_BRANCH=prow-job-tracking
16+
FILE_TO_PUSH=job/${JOB_NAME}
17+
18+
./trigger-prow-job-from-git.sh -r ${TRACKING_REPO} \
19+
-b ${TRACKING_BRANCH} -s ${PWD}/env/date.list -d ${FILE_TO_PUSH}
20+
21+
if [ $? -ne 0 ]
22+
then
23+
echo "Failed to add the git commit to trigger the next job"
24+
exit 3
25+
fi

trigger-prow-job-from-git.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -eu
1212
display_usage() {
1313
echo "Usage: -r <TRACKING_REPO> -b <TRACKING_BRANCH> -s <SRC_FILE> -d <DEST_FILE>"
1414
echo "Example:"
15-
echo " trigger-prow-job-from-git.sh -r alunsin/docker-ce-build" \
15+
echo " trigger-prow-job-from-git.sh -r ppc64le-cloud/docker-ce-build" \
1616
"-b prow-job-tracking -s $PWD/env/date.list -d job/postsubmit-build-docker"
1717
exit 2
1818
}

upstream-master-ci/info.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ rm -f ${DIR_LOGS_COS}/info.log && touch ${DIR_LOGS_COS}/info.log
2424
docker version 2>&1 | tee -a "${DIR_LOGS_COS}/info.log"
2525
docker info 2>&1 | tee -a "${DIR_LOGS_COS}/info.log"
2626
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"
27+
set -o pipefail
2728
bash ${PWD}/check-config.sh 2>&1 | tee -a "${DIR_LOGS_COS}/info.log" || true
28-
exit 0
29+
exit $?

upstream-master-ci/prow-build-dev-image.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ echo "${PATH_CI}"
66
export PATH_CI
77

88
echo "Prow Job to run CI tests on the Docker packages"
9-
echo "Skip Build Dev image"
10-
exit 0
119
# Go to the workdir
1210
echo "* Starting dockerd and waiting for it *"
1311
${PWD}/dockerctl.sh start

upstream-master-ci/prow-info-docker.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ set -u
44
# Path to the scripts
55
PATH_CI="${PWD}/upstream-master-ci"
66
export PATH_CI
7+
DATE=`date +%d%m%y-%H%M`
8+
9+
REPO_OWNER="ppc64le-cloud"
10+
REPO_NAME="docker-ce-build"
11+
PATH_SCRIPTS="/home/prow/go/src/github.com/${REPO_OWNER}/${REPO_NAME}"
12+
echo DATE=\"${DATE}\" 2>&1 | tee ${PATH_SCRIPTS}/env/date.list
713

814
echo "Prow Job to run CI tests on the Docker packages"
915

@@ -14,4 +20,13 @@ echo "** Set up (env files) **"
1420
chmod ug+x ${PATH_CI}/get-env-ci.sh && ${PATH_CI}/get-env-ci.sh
1521

1622
echo "*** Check Config ***"
17-
chmod ug+x ${PATH_CI}/info.sh && ${PATH_CI}/info.sh
23+
chmod ug+x ${PATH_CI}/info.sh
24+
${PATH_CI}/info.sh
25+
26+
if [[ $? == 0 ]]; then
27+
chmod ug+x ./setup-pj-trigger.sh
28+
./setup-pj-trigger.sh -r ppc64le-cloud/docker-ce-build
29+
else
30+
echo "The kernel is not suitable to run Docker."
31+
exit 1
32+
fi

upstream-master-ci/prow-integration-tests.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ set -u
44
begin=$SECONDS
55

66
echo "Prow Job to run integration tests on the Docker packages"
7-
echo "Skip integration tests"
8-
exit 0
97
${PWD}/dockerctl.sh start
108

119
set -o allexport

upstream-master-ci/prow-unit-test-docker.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ begin=$SECONDS
77
PATH_CI="${PWD}/upstream-master-ci"
88
export PATH_CI
99
echo "Prow Job to run CI tests on the Docker packages"
10-
echo "Skip unit tests"
11-
exit 0
1210
if [[ -z ${ARTIFACTS} ]]; then
1311
ARTIFACTS=/logs/artifacts
1412
echo "Setting ARTIFACTS to ${ARTIFACTS}"

0 commit comments

Comments
 (0)