add PR comment id to uploaded metadata

- passes PR comment id to script used for uploading tarball and metadata file to
  S3 bucket
- script extended to use additional argument and to add the PR comment id to the
  uploaded metadata file

scripts/eessi-upload-to-staging

@@ -42,6 +42,7 @@ function create_metadata_file
   _url=$2
   _repository=$3
   _pull_request=$4
+  _pull_request_comment_id=$5
 
   _tmpfile=$(mktemp)
 
@@ -56,10 +57,11 @@ function create_metadata_file
     --arg url "${_url}" \
     --arg repo "${_repository}" \
     --arg pr "${_pull_request}" \
+    --arg pr_comment_id "${_pull_request_comment_id}" \
     '{
        uploader: {username: $un, ip: $ip, hostname: $hn},
        payload: {filename: $fn, size: $sz, ctime: $ct, sha256sum: $sha256, url: $url},
-       link2pr: {repo: $repo, pr: $pr},
+       link2pr: {repo: $repo, pr: $pr, pr_comment_id: $pr_commend_id},
      }' > "${_tmpfile}"
 
   echo "${_tmpfile}"
@@ -70,6 +72,10 @@ function display_help
   echo "Usage: $0 [OPTIONS] <filenames>"                                        >&2
   echo "  -e | --endpoint-url URL      -  endpoint url (needed for non AWS S3)" >&2
   echo "  -h | --help                  -  display this usage information"       >&2
+  echo "  -i | --pr-comment-id         -  identifier of a PR comment; may be"   >&2
+  echo "                                  used to efficiently determine the PR" >&2
+  echo "                                  comment to be updated during the"     >&2
+  echo "                                  ingestion procedure"                  >&2
   echo "  -n | --bucket-name BUCKET    -  bucket name (same as BUCKET above)"   >&2
   echo "  -p | --pull-request NUMBER   -  a pull request NUMBER; used to"       >&2
   echo "                                  link the upload to a PR"              >&2
@@ -97,8 +103,11 @@ bucket_name="eessi-staging"
 
 # provided via options in the bot's config file app.cfg
 endpoint_url=
-pull_request=
-repository=
+
+# provided via command line arguments
+pr_comment_id="none"
+pull_request="none"
+repository="EESSI/software-layer"
 
 while [[ $# -gt 0 ]]; do
   case $1 in
@@ -110,6 +119,10 @@ while [[ $# -gt 0 ]]; do
       display_help
       exit 0
       ;;
+    -i|--pr-comment-id)
+      pr_comment_id="$2"
+      shift 2
+      ;;
     -n|--bucket-name)
       bucket_name="$2"
       shift 2
@@ -161,7 +174,8 @@ for file in "$*"; do
         echo "Creating metadata file"
         url="${bucket_base}/${aws_path}/${aws_file}"
         metadata_file=$(create_metadata_file "${file}" "${url}" \
-                                             "${repository}" "${pull_request}")
+                                             "${repository}" "${pull_request}" \
+                                             "${pr_comment_id}")
         echo "metadata:"
         cat ${metadata_file}
 

tasks/deploy.py

@@ -301,6 +301,7 @@ def upload_tarball(job_dir, build_target, timestamp, repo_name, pr_number, pr_co
         cmd_args.extend(['--endpoint-url', endpoint_url])
     cmd_args.extend(['--repository', repo_name])
     cmd_args.extend(['--pull-request', str(pr_number)])
+    cmd_args.extend(['--pr-comment-id', str(pr_comment_id)])
     cmd_args.append(abs_path)
     upload_cmd = ' '.join(cmd_args)