Skip to content

Commit

Permalink
fixes on build and cwl-wrapper
Browse files Browse the repository at this point in the history
  • Loading branch information
fabricebrito committed Oct 20, 2023
1 parent 597e5e6 commit 0c8e1fb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ jobs:
- run: yq -i eval '(.$graph[] | select (.id == "norm_diff") ).hints.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/norm_diff:${{needs.version.outputs.app-version}}"' water-bodies/app-package-cloud-native.cwl
- run: yq -i eval '(.$graph[] | select (.id == "otsu") ).hints.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/otsu:${{needs.version.outputs.app-version}}"' water-bodies/app-package-cloud-native.cwl
- run: yq -i eval '(.$graph[] | select (.id == "stac") ).hints.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stac:${{needs.version.outputs.app-version}}"' water-bodies/app-package-cloud-native.cwl
- run: yq -i eval '(.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-in.yaml
- run: yq -i eval '(.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-out.yaml
- run: yq -i eval '.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-in.yaml
- run: yq -i eval '.requirements.DockerRequirement.dockerPull = "ghcr.io/terradue/ogc-eo-application-package-hands-on/stage:${{needs.version.outputs.app-version}}"' stage/stage-out.yaml
- run: mkdir downloads
- run: cp water-bodies/app-package.cwl downloads/app-water-bodies.${{needs.version.outputs.app-version}}.cwl
- run: cp water-bodies/app-package-cloud-native.cwl downloads/app-water-bodies-cloud-native.${{needs.version.outputs.app-version}}.cwl
Expand Down
11 changes: 10 additions & 1 deletion containers/cwl-wrapper/templates/main.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
class: Workflow
$namespaces:
cwltool: http://commonwl.org/cwltool#
doc: Main stage manager
id: main
label: macro-cwl
hints:
"cwltool:Secrets":
secrets: []
inputs: {}
outputs: {}

requirements:
SubworkflowFeatureRequirement: {}
ScatterFeatureRequirement: {}
InlineJavascriptRequirement: {}
steps:
node_stage_out:
in: {}
out: []
run: ''
8 changes: 4 additions & 4 deletions stage/stage-out.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ hints:
dockerPull: stac-asset:latest
"cwltool:Secrets":
secrets:
- AWS_SERVICEURL
- AWS_REGION
- AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY
- aws_access_key_id
- aws_secret_access_key
- region_name
- endpoint_url

inputs:
s3_bucket:
Expand Down

0 comments on commit 0c8e1fb

Please sign in to comment.