Skip to content

Revert "Update noaa sessions to use script submitter v3.6 (#736)" #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avidalto wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Update noaa sessions to use script submitter v3.6 (#736)" #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions workflow/yamls/jupyter-host/noaa_v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ jobs:
ssh:
remoteHost: ${{ inputs.resource.ip }}
steps:
- uses: marketplace/session_runner/v1.4
- uses: marketplace/session_runner/v1.3
early-cancel: any-job-failed
with:
session: ${{ sessions.session }}
resource: ${{ inputs.resource }}
cluster:
scheduler: ${{ inputs.cluster.scheduler }}
slurm:
is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
account: ${{ inputs.cluster.slurm.account }}
partition: ${{ inputs.cluster.slurm.partition }}
qos: ${{ inputs.cluster.slurm.qos }}
Expand All @@ -75,7 +75,7 @@ jobs:
scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
time: ${{ inputs.cluster.slurm.time }}
pbs:
is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
service:
start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
Expand Down Expand Up @@ -108,14 +108,14 @@ jobs:
slurm:
type: group
label: SLURM Directives
hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
label: Is SLURM disabled?
account:
label: SLURM account
type: slurm-accounts
Expand Down Expand Up @@ -166,11 +166,11 @@ jobs:
hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
label: Is PBS disabled?
scheduler_directives:
label: Scheduler Directives
type: editor
Expand Down
22 changes: 11 additions & 11 deletions workflow/yamls/jupyterlab-host/noaa_v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ jobs:
ssh:
remoteHost: ${{ inputs.resource.ip }}
steps:
- uses: marketplace/session_runner/v1.4
- uses: marketplace/session_runner/v1.3
early-cancel: any-job-failed
with:
session: ${{ sessions.session }}
resource: ${{ inputs.resource }}
cluster:
scheduler: ${{ inputs.cluster.scheduler }}
slurm:
is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
account: ${{ inputs.cluster.slurm.account }}
partition: ${{ inputs.cluster.slurm.partition }}
qos: ${{ inputs.cluster.slurm.qos }}
Expand All @@ -78,7 +78,7 @@ jobs:
scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
time: ${{ inputs.cluster.slurm.time }}
pbs:
is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
service:
start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
Expand Down Expand Up @@ -111,14 +111,14 @@ jobs:
slurm:
type: group
label: SLURM Directives
hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
label: Is SLURM disabled?
account:
label: SLURM account
type: slurm-accounts
Expand Down Expand Up @@ -169,11 +169,11 @@ jobs:
hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
label: Is PBS disabled?
scheduler_directives:
label: Scheduler Directives
type: editor
Expand Down
22 changes: 11 additions & 11 deletions workflow/yamls/kasmvnc-container/noaa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ jobs:
ssh:
remoteHost: ${{ inputs.resource.ip }}
steps:
- uses: marketplace/session_runner/v1.4
- uses: marketplace/session_runner/v1.3
early-cancel: any-job-failed
with:
session: ${{ sessions.session }}
resource: ${{ inputs.resource }}
cluster:
scheduler: ${{ inputs.cluster.scheduler }}
slurm:
is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
account: ${{ inputs.cluster.slurm.account }}
partition: ${{ inputs.cluster.slurm.partition }}
qos: ${{ inputs.cluster.slurm.qos }}
Expand All @@ -73,7 +73,7 @@ jobs:
scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
time: ${{ inputs.cluster.slurm.time }}
pbs:
is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
service:
start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.container_runtime }}/start-template-v3.sh
Expand Down Expand Up @@ -115,14 +115,14 @@ jobs:
slurm:
type: group
label: SLURM Directives
hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
label: Is SLURM disabled?
account:
label: SLURM account
type: slurm-accounts
Expand Down Expand Up @@ -173,11 +173,11 @@ jobs:
hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
label: Is PBS disabled?
scheduler_directives:
label: Scheduler Directives
type: editor
Expand Down
22 changes: 11 additions & 11 deletions workflow/yamls/openvscode/noaa_v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ jobs:
ssh:
remoteHost: ${{ inputs.resource.ip }}
steps:
- uses: marketplace/session_runner/v1.4
- uses: marketplace/session_runner/v1.3
early-cancel: any-job-failed
with:
session: ${{ sessions.session }}
resource: ${{ inputs.resource }}
cluster:
scheduler: ${{ inputs.cluster.scheduler }}
slurm:
is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
account: ${{ inputs.cluster.slurm.account }}
partition: ${{ inputs.cluster.slurm.partition }}
qos: ${{ inputs.cluster.slurm.qos }}
Expand All @@ -71,7 +71,7 @@ jobs:
scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
time: ${{ inputs.cluster.slurm.time }}
pbs:
is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
service:
start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
Expand Down Expand Up @@ -104,14 +104,14 @@ jobs:
slurm:
type: group
label: SLURM Directives
hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
label: Is SLURM disabled?
account:
label: SLURM account
type: slurm-accounts
Expand Down Expand Up @@ -162,11 +162,11 @@ jobs:
hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
label: Is PBS disabled?
scheduler_directives:
label: Scheduler Directives
type: editor
Expand Down
22 changes: 11 additions & 11 deletions workflow/yamls/vncserver/noaa-armforge_v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ jobs:
echo "partition=${{ inputs.cluster.slurm.partition_tag_cloud }}" | tee -a $OUTPUTS
fi

- uses: marketplace/session_runner/v1.4
- uses: marketplace/session_runner/v1.3
early-cancel: any-job-failed
with:
session: ${{ sessions.session }}
resource: ${{ inputs.resource }}
cluster:
scheduler: ${{ inputs.cluster.scheduler }}
slurm:
is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
account: ${{ inputs.cluster.slurm.account }}
partition: ${{ needs.session_runner.outputs.partition }}
qos: ${{ inputs.cluster.slurm.qos }}
Expand All @@ -88,7 +88,7 @@ jobs:
scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
time: ${{ inputs.cluster.slurm.time }}
pbs:
is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
service:
start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
Expand Down Expand Up @@ -121,14 +121,14 @@ jobs:
slurm:
type: group
label: SLURM Directives
hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
label: Is SLURM disabled?
account:
label: SLURM account
type: slurm-accounts
Expand Down Expand Up @@ -201,11 +201,11 @@ jobs:
hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
label: Is PBS disabled?
scheduler_directives:
label: Scheduler Directives
type: editor
Expand Down
22 changes: 11 additions & 11 deletions workflow/yamls/vncserver/noaa-matlab_v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ jobs:
echo "partition=${{ inputs.cluster.slurm.partition_tag_cloud }}" | tee -a $OUTPUTS
fi

- uses: marketplace/session_runner/v1.4
- uses: marketplace/session_runner/v1.3
early-cancel: any-job-failed
with:
session: ${{ sessions.session }}
resource: ${{ inputs.resource }}
cluster:
scheduler: ${{ inputs.cluster.scheduler }}
slurm:
is_enabled: ${{ inputs.cluster.slurm.is_enabled }}
is_disabled: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
account: ${{ inputs.cluster.slurm.account }}
partition: ${{ needs.session_runner.outputs.partition }}
qos: ${{ inputs.cluster.slurm.qos }}
Expand All @@ -87,7 +87,7 @@ jobs:
scheduler_directives: ${{ inputs.cluster.slurm.scheduler_directives }}
time: ${{ inputs.cluster.slurm.time }}
pbs:
is_enabled: ${{ inputs.cluster.pbs.is_enabled }}
is_disabled: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
scheduler_directives: ${{ inputs.cluster.pbs.scheduler_directives }}
service:
start_service_script: ${PW_PARENT_JOB_DIR}/${{ inputs.service.name }}/start-template-v3.sh
Expand Down Expand Up @@ -120,14 +120,14 @@ jobs:
slurm:
type: group
label: SLURM Directives
hidden: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
hidden: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is SLURM enabled? Yes, unless the slurm section is hidden and ignored
default: ${{ inputs.resource.provider == 'existing' && inputs.resource.schedulerType != 'slurm' || inputs.cluster.scheduler == false }}
label: Is SLURM disabled?
account:
label: SLURM account
type: slurm-accounts
Expand Down Expand Up @@ -200,11 +200,11 @@ jobs:
hidden: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
ignore: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
items:
is_enabled:
is_disabled:
type: boolean
hidden: true
default: true
label: Is PBS enabled? Yes, unless the pbs section is hidden and ignored
default: ${{ inputs.resource.schedulerType != 'pbs' || inputs.cluster.scheduler == false }}
label: Is PBS disabled?
scheduler_directives:
label: Scheduler Directives
type: editor
Expand Down
Loading