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/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