Skip to content

Commit

Permalink
3.0.2 updates for Aloe release to jobs service
Browse files Browse the repository at this point in the history
  • Loading branch information
johnfonner committed Jun 26, 2019
1 parent 20cd107 commit c47fe3c
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 891 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# Change Log
All notable changes to this project will be documented in this file.

## 3.0.2 - 2019-06-25
### ADDED
- jobs-hide and jobs-unhide; this replaces jobs-delete and jobs-restore

### CHANGED
- Updated jobs-submit and jobs-template to reflect the new jobs service API updates

### REMOVED
- Depricated commands jobs-tail, jobs-delete (now jobs-hide), jobs-restore (now jobs-unhide), jobs-kick, jobs-run-this, and jobs-output


## 3.0.1 - 2019-04-23
### ADDED
- Updated documentation to reflect transition to api.tacc.utexas.edu
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.public
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL org.label-schema.vendor = "Texas Advanced Computing Center"
LABEL org.label-schema.name = "TACC Tapis API CLI"
LABEL org.label-schema.vcs-url = "https://github.com/TACC-Cloud/home"
LABEL org.label-schema.vcs-ref = "master"
LABEL org.label-schema.version = "3.0.1"
LABEL org.label-schema.version = "3.0.2"
LABEL org.label-schema.organization=tacc.cloud
LABEL cloud.tacc.project="Tapis API CLI"

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.0.2
17 changes: 9 additions & 8 deletions bin/jobs-delete → bin/jobs-hide
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash
#
# jobs-delete
# jobs-hide
#
# author: [email protected]
#
# This script is part of the Agave API command line interface (CLI).
# It deletes a job. If running the job will be stopped.
#
# It marks a job as invisible to most APIs like job listing or history calls.
# This can only be done for jobs in a terminal state.

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

Expand All @@ -22,7 +22,8 @@ interactive_opts=(apisecret apikey)
usage() {
echo -n "$(basename $0) [OPTION]... [JOB_ID]
Delete an existing job. If running, the job will be killed.
Hide an existing job from most APIs, such as listing and history. If the job is
still running, it cannot be hidden. It must be stopped first.
Options:
-z, --access_token Access token
Expand Down Expand Up @@ -51,16 +52,16 @@ main() {
#set -x

if [ -z "$args" ]; then
err "Please specify a valid app id to delete"
err "Please specify a valid app id to hide"
else

cmd="curl -sk -H \"${authheader}\" -X DELETE '$hosturl$args?pretty=true'"
cmd="curl -sk -H \"${authheader}\" -H \"Content-Type: application/json\" -X POST '$hosturl${args}/hide?pretty=true'"

if ((veryverbose)); then
[ "$piped" -eq 0 ] && log "Calling $cmd"
fi

response=`curl -sk -H "${authheader}" -X DELETE "$hosturl$args?pretty=true"`
response=`curl -sk -H "${authheader}" -H "Content-Type: application/json" -X POST "$hosturl${args}/hide?pretty=true"`

if [[ $(jsonquery "$response" "status") = 'success' ]]; then
result=$(format_api_json "$response")
Expand All @@ -80,7 +81,7 @@ format_api_json() {
result=$(jsonquery "$1" "result" 1)
json_prettyify "${result}"
else
echo "Successfully deleted job $args"
echo "Successfully hid job $args"
fi
}

Expand Down
141 changes: 0 additions & 141 deletions bin/jobs-kick

This file was deleted.

157 changes: 0 additions & 157 deletions bin/jobs-output

This file was deleted.

Loading

0 comments on commit c47fe3c

Please sign in to comment.