round-robin.sh: Simplfy again dashboard generation

Change-Id: I4c77d6125e7981485842ed317b6f7b9ad05e1f80

2 files changed, 14 insertions, 27 deletions

diff --git a/dashboard-generate-squad.sh b/dashboard-generate-squad.sh
index a98ab8ce..9c54003d 100755
--- a/dashboard-generate-squad.sh
+++ b/dashboard-generate-squad.sh
@@ -300,16 +300,6 @@ EOF
     fi
 
     chmod a+x $pushcmdfile
-
-    # Generate top-level dashboard-push (as draft only).
-    cat > $dashboard_dir/dashboard-push.sh << EOF
-#!/bin/bash -f
-
-\$(dirname \$0)/../dashboard/squad/dashboard-push-squad.sh &
-wait \$! || true
-
-EOF
-    chmod a+x $dashboard_dir/dashboard-push.sh
     )
 }
 
diff --git a/round-robin.sh b/round-robin.sh
index d4a4c55d..a608598f 100644
--- a/round-robin.sh
+++ b/round-robin.sh
@@ -1102,7 +1102,7 @@ create_dashboard_dir ()
 
     # Create dashboard-generate.sh cmd file
     cat > ${rr[top_artifacts]}/dashboard/dashboard-generate.sh << EOF
-#!/bin/bash -f
+#!/bin/bash
 
 top_artifacts=\$(dirname \$0)/..
 jenkins_scripts=jenkins-scripts
@@ -1119,26 +1119,25 @@ fi
 EOF
     chmod a+x ${rr[top_artifacts]}/dashboard/dashboard-generate.sh
 
-    # and execute it
-    ${rr[top_artifacts]}/dashboard/dashboard-generate.sh
-}
+    # Generate top-level dashboard-push.
+    cat > ${rr[top_artifacts]}/dashboard/dashboard-push.sh << EOF
+#!/bin/bash
 
+\$(dirname \$0)/../dashboard/squad/dashboard-push-squad.sh &
+wait \$! || true
 
-# simply generate the dashboard-push.sh file. Execution is done from jenkins.
-#  (invoked from UPDATE_BASELINE stage)
-create_dashboard_push_cmd ()
-{
-    echo " * create_dashboard_push_cmd"
+EOF
+    chmod a+x ${rr[top_artifacts]}/dashboard/dashboard-push.sh
 
-    # Generate artifacts/jenkins/dashboard-push.sh, which the CI job
-    # will use to update dashboard in squad server.
+    # copy to be used by jenkins
     mkdir -p ${rr[top_artifacts]}/jenkins/
-    if [ -f ${rr[top_artifacts]}/dashboard/dashboard-push.sh ]; then
-      cp ${rr[top_artifacts]}/dashboard/dashboard-push.sh ${rr[top_artifacts]}/jenkins/dashboard-push.sh
-      chmod a+x ${rr[top_artifacts]}/jenkins/dashboard-push.sh
-    fi
+    cp ${rr[top_artifacts]}/dashboard/dashboard-push.sh ${rr[top_artifacts]}/jenkins/dashboard-push.sh
+
+    # and execute it dashboard-generate.sh
+    ${rr[top_artifacts]}/dashboard/dashboard-generate.sh
 }
 
+
 # Check if current build regressed compared to the baseline
 check_regression ()
 {
@@ -1310,7 +1309,5 @@ $(cat ${rr[top_artifacts]}/mail/mail-body.txt)"
 git -C base-artifacts push --force baseline HEAD:refs/heads/${rr[baseline_branch]}
 EOF
     chmod +x ${rr[top_artifacts]}/jenkins/git-push.sh
-
-    create_dashboard_push_cmd
     )
 }