Skip to content

Commit 7a347df

Browse files
ric-evansgithub-actions
andauthored
AP Migration: Add osg, Deprecate Taskforce.collector [minor] (#86)
Co-authored-by: github-actions <[email protected]>
1 parent e314770 commit 7a347df

28 files changed

+127
-139
lines changed

.github/workflows/image-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
jobs:
2020
image-publish:
21-
uses: WIPACrepo/wipac-dev-workflows/.github/workflows/image-publish.yml@v1.14
21+
uses: WIPACrepo/wipac-dev-workflows/.github/workflows/image-publish.yml@v1.16
2222
permissions: # for GITHUB_TOKEN
2323
packages: write
2424
with:

.github/workflows/wipac-cicd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
with:
9898
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
9999
ref: ${{ github.ref }} # dont lock to sha (action needs to push)
100-
- uses: WIPACrepo/wipac-dev-py-setup-action@v5.5
100+
- uses: WIPACrepo/wipac-dev-py-setup-action@v5.7
101101
with:
102102
mode: PACKAGING
103103
python_min: 3.12
@@ -219,7 +219,7 @@ jobs:
219219
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
220220
services:
221221
mongo:
222-
image: bitnami/mongodb:4
222+
image: bitnamilegacy/mongodb:4
223223
ports:
224224
- 27017:27017
225225
env:
@@ -325,7 +325,7 @@ jobs:
325325
integration-test-full-wms-workflow,
326326
unit-tests
327327
]
328-
uses: WIPACrepo/wipac-dev-workflows/.github/workflows/tag-and-release.yml@v1.14
328+
uses: WIPACrepo/wipac-dev-workflows/.github/workflows/tag-and-release.yml@v1.16
329329
permissions: # for GITHUB_TOKEN
330330
contents: write
331331
with:

Docs/.openapi-generator/FILES

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ Models/DeactivatedWorkflowResponseObject.md
44
Models/FindObject.md
55
Models/TaskDirectiveObject.md
66
Models/TaskforceObject.md
7-
Models/TaskforceObject_cluster_id.md
8-
Models/TaskforceObject_n_workers.md
9-
Models/TaskforceObject_phase_change_log.md
10-
Models/TaskforceObject_phase_change_log_source_event_time.md
117
Models/TaskforceObject_pilot_config.md
128
Models/TaskforceObject_pilot_config_environment_value.md
139
Models/TaskforceObject_submit_dict_value.md
@@ -37,8 +33,5 @@ Models/_v1_workflows_post_200_response.md
3733
Models/_v1_workflows_post_request.md
3834
Models/_v1_workflows_post_request_tasks_inner.md
3935
Models/pilot_config.md
40-
Models/pilot_config_environment_value.md
4136
Models/worker_config.md
42-
Models/worker_config_worker_disk.md
43-
Models/worker_config_worker_memory.md
4437
README.md

Docs/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.16.0-SNAPSHOT
1+
7.17.0-SNAPSHOT

Docs/Apis/DefaultApi.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ This endpoint does not need any parameter.
364364

365365
<a name="GET /v1/tms/pending-starter/taskforces"></a>
366366
# **GET /v1/tms/pending-starter/taskforces**
367-
> _v1_tms_pending_starter_taskforces_get_200_response GET /v1/tms/pending-starter/taskforces(collector, schedd)
367+
> _v1_tms_pending_starter_taskforces_get_200_response GET /v1/tms/pending-starter/taskforces(schedd, collector)
368368
369369

370370

@@ -374,8 +374,8 @@ This endpoint does not need any parameter.
374374

375375
|Name | Type | Description | Notes |
376376
|------------- | ------------- | ------------- | -------------|
377-
| **collector** | **String**| name of the condor collector | [default to null] |
378377
| **schedd** | **String**| name of the condor schedd | [default to null] |
378+
| **collector** | **String**| DEPRECATED: name of the condor collector -- no longer used/needed | [optional] [default to null] |
379379

380380
### Return type
381381

@@ -391,7 +391,7 @@ This endpoint does not need any parameter.
391391

392392
<a name="GET /v1/tms/pending-stopper/taskforces"></a>
393393
# **GET /v1/tms/pending-stopper/taskforces**
394-
> _v1_tms_pending_stopper_taskforces_get_200_response GET /v1/tms/pending-stopper/taskforces(collector, schedd)
394+
> _v1_tms_pending_stopper_taskforces_get_200_response GET /v1/tms/pending-stopper/taskforces(schedd, collector)
395395
396396

397397

@@ -401,8 +401,8 @@ This endpoint does not need any parameter.
401401

402402
|Name | Type | Description | Notes |
403403
|------------- | ------------- | ------------- | -------------|
404-
| **collector** | **String**| name of the condor collector | [default to null] |
405404
| **schedd** | **String**| name of the condor schedd | [default to null] |
405+
| **collector** | **String**| DEPRECATED: name of the condor collector -- no longer used/needed | [optional] [default to null] |
406406

407407
### Return type
408408

Docs/Models/TaskforceObject.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
| **workflow\_id** | **String** | The identifier of the overarching workflow object (N*M taskforces : M task directives : 1 workflow). | [optional] [default to null] |
99
| **timestamp** | **BigDecimal** | The epoch time when this taskforce was created. | [optional] [default to null] |
1010
| **priority** | **Integer** | The priority level relative to other taskforces (usually, this value is inherited from the parent workflow object). | [optional] [default to null] |
11-
| **collector** | **String** | The address of the HTCondor collector. | [optional] [default to null] |
11+
| **collector** | **String** | DEPRECATED: The address of the HTCondor collector -- no longer used/needed. | [optional] [default to null] |
1212
| **schedd** | **String** | The address of the HTCondor schedd. | [optional] [default to null] |
13-
| **n\_workers** | [**TaskforceObject_n_workers**](TaskforceObject_n_workers.md) | | [optional] [default to null] |
13+
| **n\_workers** | **Integer** | The number of workers in this taskforce&#39;s HTCondor cluster (immutable). | [optional] [default to null] |
1414
| **pilot\_config** | [**TaskforceObject_pilot_config**](TaskforceObject_pilot_config.md) | | [optional] [default to null] |
1515
| **worker\_config** | [**TaskforceObject_worker_config**](TaskforceObject_worker_config.md) | | [optional] [default to null] |
16-
| **cluster\_id** | [**TaskforceObject_cluster_id**](TaskforceObject_cluster_id.md) | | [optional] [default to null] |
16+
| **cluster\_id** | **Integer** | The identifier for the associated HTCondor cluster. | [optional] [default to null] |
1717
| **submit\_dict** | [**Map**](TaskforceObject_submit_dict_value.md) | The actual HTCondor submit class ad. | [optional] [default to null] |
1818
| **job\_event\_log\_fpath** | **String** | The file path on the HTCondor AP containing job event logs. | [optional] [default to null] |
1919
| **phase** | **String** | The current phase of the taskforce within the workflow&#39;s lifetime. Not all taskforces will enter every phase. | [optional] [default to null] |

Docs/Models/TaskforceObject_cluster_id.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

Docs/Models/TaskforceObject_n_workers.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

Docs/Models/TaskforceObject_phase_change_log.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

Docs/Models/TaskforceObject_phase_change_log_source_event_time.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)