scripts: fix the publish issue [1/1]
PD#SWPL-67525
Problem:
failed to publish manifest.xml and jenkins_trigger.txt due to wrong file name
Solution:
Correct the file name
Rename CURRENT_MANIFEST to MANIFEST
Rename curr_manifest.xml to manifest.xml
Verify:
ad401_a113l
Change-Id: Ie8092213e92e3f2816a8e67e73a2eead9c2afbe3
Signed-off-by: Kelvin Zhang <kelvin.zhang@amlogic.com>
diff --git a/cherry_pick.sh b/cherry_pick.sh
index 3b6eb9e..f34f146 100755
--- a/cherry_pick.sh
+++ b/cherry_pick.sh
@@ -44,7 +44,7 @@
echo -e "======== Manually applying Gerrit change $MANUAL_GERRIT_CHANGE_NUMBER on Project $GERRIT_PROJECT ========"
fi
- keyline=`grep "name=\"$GERRIT_PROJECT\"" $CURRENT_MANIFEST`
+ keyline=`grep "name=\"$GERRIT_PROJECT\"" $MANIFEST`
pattern="path="
get_repo_path
@@ -65,7 +65,7 @@
i=1
for GERRIT_PROJECT in $GERRIT_PROJECTS; do
echo "-------- Applying patch $i on Project $GERRIT_PROJECT --------"
- keyline=`grep "name=\"$GERRIT_PROJECT\"" $CURRENT_MANIFEST`
+ keyline=`grep "name=\"$GERRIT_PROJECT\"" $MANIFEST`
pattern="path="
get_repo_path
@@ -97,7 +97,7 @@
done
echo -e "\n-------- Manually applying patch on Project $GIT_PROJECT --------"
- keyline=`grep "name=\"$GIT_PROJECT\"" $CURRENT_MANIFEST`
+ keyline=`grep "name=\"$GIT_PROJECT\"" $MANIFEST`
pattern="path="
get_repo_path
@@ -123,8 +123,8 @@
[ -z "$OUTPUT_DIR" ] && OUTPUT_DIR=$PWD/output
[ ! -d $OUTPUT_DIR ] && mkdir -p $OUTPUT_DIR
-[ -z "$CURRENT_MANIFEST" ] && CURRENT_MANIFEST="$OUTPUT_DIR/curr_manifest.xml"
-[ ! -f $CURRENT_MANIFEST ] && repo manifest -r -o $CURRENT_MANIFEST
+[ -z "$MANIFEST" ] && MANIFEST="$OUTPUT_DIR/manifest.xml"
+[ ! -f $MANIFEST ] && repo manifest -r -o $MANIFEST
[ -z "$GERRIT_SERVER" ] && GERRIT_SERVER="scgit.amlogic.com"
[ -z "$GERRIT_PORT" ] && GERRIT_PORT="29418"
diff --git a/gen_jenkins_trigger.sh b/gen_jenkins_trigger.sh
index a82d408..133f230 100755
--- a/gen_jenkins_trigger.sh
+++ b/gen_jenkins_trigger.sh
@@ -6,10 +6,10 @@
#
gen_jenkins_trigger() {
- if [ -s $CURRENT_MANIFEST ]; then
+ if [ -s $MANIFEST ]; then
echo "======== Generate Jenkins Trigger ========"
- JENKINS_TRIGGER="$OUTPUT_DIR/jenkins_trigger.txt"
+ [ -z "$JENKINS_TRIGGER" ] && JENKINS_TRIGGER="$OUTPUT_DIR/jenkins_trigger.txt"
rm -f $JENKINS_TRIGGER
pattern="name="
@@ -25,7 +25,7 @@
echo "p=$repo_name" >> $JENKINS_TRIGGER
echo "b=projects/amlogic-dev" >> $JENKINS_TRIGGER
fi
- done < $CURRENT_MANIFEST
+ done < $MANIFEST
echo -e "======== Done ========\n"
fi
@@ -34,8 +34,8 @@
[ -z "$OUTPUT_DIR" ] && OUTPUT_DIR=$PWD/output
[ ! -d $OUTPUT_DIR ] && mkdir -p $OUTPUT_DIR
-[ -z "$CURRENT_MANIFEST" ] && CURRENT_MANIFEST="$OUTPUT_DIR/curr_manifest.xml"
-[ ! -f $CURRENT_MANIFEST ] && repo manifest -r -o $CURRENT_MANIFEST
+[ -z "$MANIFEST" ] && MANIFEST="$OUTPUT_DIR/manifest.xml"
+[ ! -f $MANIFEST ] && repo manifest -r -o $MANIFEST
[ -z "$LAST_MANIFEST" ] && LAST_MANIFEST="$OUTPUT_DIR/last_manifest.xml"
@@ -44,6 +44,6 @@
if [ ! -f $LAST_MANIFEST ] || [ -f $LAST_BUILD_FAILURE ]; then
gen_jenkins_trigger
else
- comm -3 <(sort $LAST_MANIFEST) <(sort $CURRENT_MANIFEST) > $DIFF_MANIFEST
+ comm -3 <(sort $LAST_MANIFEST) <(sort $MANIFEST) > $DIFF_MANIFEST
[ -s $DIFF_MANIFEST ] && gen_jenkins_trigger
fi
diff --git a/jenkins_verify.sh b/jenkins_verify.sh
index 24dcb80..7d8a972 100755
--- a/jenkins_verify.sh
+++ b/jenkins_verify.sh
@@ -30,8 +30,8 @@
WORK_DIR=$BUILDCHECK_BASE_PATH/$PROJECT_NAME/$BRANCH
OUTPUT_DIR=$WORK_DIR/output
+MANIFEST="$OUTPUT_DIR/manifest.xml"
LAST_MANIFEST="$OUTPUT_DIR/last_manifest.xml"
-CURRENT_MANIFEST="$OUTPUT_DIR/curr_manifest.xml"
DIFF_MANIFEST="$OUTPUT_DIR/diff_manifest.xml"
LAST_BUILD_FAILURE="$OUTPUT_DIR/.last_build_failure"
@@ -75,11 +75,11 @@
else
repo forall -c git reset -q --hard origin/$BRANCH_NAME
fi
-repo manifest -r -o $CURRENT_MANIFEST
+repo manifest -r -o $MANIFEST
echo -e "======== Done ========\n"
-if [ -f $LAST_MANIFEST ] && [ -f $CURRENT_MANIFEST ]; then
- comm -23 <(sort $LAST_MANIFEST) <(sort $CURRENT_MANIFEST) > $DIFF_MANIFEST
+if [ -f $LAST_MANIFEST ] && [ -f $MANIFEST ]; then
+ comm -23 <(sort $LAST_MANIFEST) <(sort $MANIFEST) > $DIFF_MANIFEST
if [ -s $DIFF_MANIFEST ]; then
echo "======== Recent Changes ========"
@@ -114,6 +114,7 @@
gerrit_review_for_gerrit_topic Start
# Generate Jenkins trigger
+JENKINS_TRIGGER="$OUTPUT_DIR/jenkins_trigger.txt"
[ "$SUBMIT_TYPE" = "daily" ] && source scripts/gen_jenkins_trigger.sh
if [[ "$MANIFEST_BRANCH" == "$BRANCH_NAME" ]]; then
diff --git a/publish.sh b/publish.sh
index 162f709..757087f 100755
--- a/publish.sh
+++ b/publish.sh
@@ -50,7 +50,7 @@
scp $KERNEL.tar.xz $FIRMWARE_ACCOUNT@$FIRMWARE_SERVER:$REMOTE_IMAGE_PATH
scp images/* $FIRMWARE_ACCOUNT@$FIRMWARE_SERVER:$REMOTE_IMAGE_PATH
popd >/dev/null
- echo "Publish images success."
+ echo "Images publish done."
else
echo "No local image path! $LOCAL_IMAGE_PATH"
fi
@@ -64,13 +64,17 @@
else
echo "Remote image path: $REMOTE_IMAGES_PATH"
fi
- LOCAL_FILES="$LOCAL_OUTPUT_PATH/build.log $LOCAL_OUTPUT_PATH/manifest.xml"
- [ -f $LOCAL_OUTPUT_PATH/gerrit_trigger.txt ] && LOCAL_FILES+=" $LOCAL_OUTPUT_PATH/jenkins_trigger.txt"
+
+ LOCAL_FILES="$LOCAL_OUTPUT_PATH/build.log"
+ [ -z "$MANIFEST" ] && MANIFEST="$OUTPUT_DIR/manifest.xml"
+ [ -f $MANIFEST ] && LOCAL_FILES+=" $MANIFEST"
+ [ -z "$JENKINS_TRIGGER" ] && JENKINS_TRIGGER="$OUTPUT_DIR/jenkins_trigger.txt"
+ [ -f $JENKINS_TRIGGER ] && LOCAL_FILES+=" $JENKINS_TRIGGER"
scp $LOCAL_FILES $FIRMWARE_ACCOUNT@$FIRMWARE_SERVER:$REMOTE_IMAGES_PATH
ssh -n $FIRMWARE_ACCOUNT@$FIRMWARE_SERVER "rm -f $LATEST_REMOTE_PATH"
ssh -n $FIRMWARE_ACCOUNT@$FIRMWARE_SERVER "ln -s $REMOTE_PATH $LATEST_REMOTE_PATH"
- echo "Post publish images done."
+ echo "Post images publish done."
}
publish_packages() {
@@ -88,7 +92,7 @@
pushd $LOCAL_PACKAGE_PATH >/dev/null
scp -r . $FIRMWARE_ACCOUNT@$FIRMWARE_SERVER:$REMOTE_PACKAGE_PATH
popd >/dev/null
- echo "Publish packages success."
+ echo "Packages publish done."
else
echo "No local package path! $LOCAL_PACKAGE_PATH"
fi
@@ -104,5 +108,5 @@
fi
LOCAL_FILES="$LOCAL_OUTPUT_PATH/build.log $LOCAL_OUTPUT_PATH/manifest.xml"
scp $LOCAL_FILES $FIRMWARE_ACCOUNT@$FIRMWARE_SERVER:$REMOTE_PACKAGES_PATH
- echo "Post publish packages done."
+ echo "Post packages publish done."
}