diff --git a/beeflow/common/integration_test.py b/beeflow/common/integration_test.py index 372073e31..704616c66 100644 --- a/beeflow/common/integration_test.py +++ b/beeflow/common/integration_test.py @@ -200,7 +200,7 @@ def checkpoint_restart(outer_workdir): workdir = os.path.join(outer_workdir, uuid.uuid4().hex) os.makedirs(workdir) workflow = utils.Workflow('checkpoint-restart', - 'beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint', + 'ci/test_workflows/clamr-wf-checkpoint', main_cwl='clamr_wf.cwl', job_file='clamr_job.yml', workdir=workdir, containers=[]) yield [workflow] @@ -216,7 +216,7 @@ def checkpoint_restart_failure(outer_workdir): workdir = os.path.join(outer_workdir, uuid.uuid4().hex) os.makedirs(workdir) workflow = utils.Workflow('checkpoint-too-long', - 'beeflow/data/cwl/bee_workflows/checkpoint-too-long', + 'ci/test_workflows/checkpoint-too-long', main_cwl='workflow.cwl', job_file='input.yml', workdir=workdir, containers=[]) yield [workflow] diff --git a/beeflow/data/cwl/bee_workflows/checkpoint-too-long/Dockerfile b/ci/test_workflows/checkpoint-too-long/Dockerfile similarity index 100% rename from beeflow/data/cwl/bee_workflows/checkpoint-too-long/Dockerfile rename to ci/test_workflows/checkpoint-too-long/Dockerfile diff --git a/beeflow/data/cwl/bee_workflows/checkpoint-too-long/input.yml b/ci/test_workflows/checkpoint-too-long/input.yml similarity index 100% rename from beeflow/data/cwl/bee_workflows/checkpoint-too-long/input.yml rename to ci/test_workflows/checkpoint-too-long/input.yml diff --git a/beeflow/data/cwl/bee_workflows/checkpoint-too-long/step0.cwl b/ci/test_workflows/checkpoint-too-long/step0.cwl similarity index 100% rename from beeflow/data/cwl/bee_workflows/checkpoint-too-long/step0.cwl rename to ci/test_workflows/checkpoint-too-long/step0.cwl diff --git a/beeflow/data/cwl/bee_workflows/checkpoint-too-long/workflow.cwl b/ci/test_workflows/checkpoint-too-long/workflow.cwl similarity index 100% rename from beeflow/data/cwl/bee_workflows/checkpoint-too-long/workflow.cwl rename to ci/test_workflows/checkpoint-too-long/workflow.cwl diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/Dockerfile.clamr-ffmpeg b/ci/test_workflows/clamr-wf-checkpoint/Dockerfile.clamr-ffmpeg similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/Dockerfile.clamr-ffmpeg rename to ci/test_workflows/clamr-wf-checkpoint/Dockerfile.clamr-ffmpeg diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/README.md b/ci/test_workflows/clamr-wf-checkpoint/README.md similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/README.md rename to ci/test_workflows/clamr-wf-checkpoint/README.md diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr.cwl b/ci/test_workflows/clamr-wf-checkpoint/clamr.cwl similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr.cwl rename to ci/test_workflows/clamr-wf-checkpoint/clamr.cwl diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_job.json b/ci/test_workflows/clamr-wf-checkpoint/clamr_job.json similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_job.json rename to ci/test_workflows/clamr-wf-checkpoint/clamr_job.json diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_job.yml b/ci/test_workflows/clamr-wf-checkpoint/clamr_job.yml similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_job.yml rename to ci/test_workflows/clamr-wf-checkpoint/clamr_job.yml diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_job_long.yml b/ci/test_workflows/clamr-wf-checkpoint/clamr_job_long.yml similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_job_long.yml rename to ci/test_workflows/clamr-wf-checkpoint/clamr_job_long.yml diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_wf.cwl b/ci/test_workflows/clamr-wf-checkpoint/clamr_wf.cwl similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/clamr_wf.cwl rename to ci/test_workflows/clamr-wf-checkpoint/clamr_wf.cwl diff --git a/beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/ffmpeg.cwl b/ci/test_workflows/clamr-wf-checkpoint/ffmpeg.cwl similarity index 100% rename from beeflow/data/cwl/bee_workflows/clamr-wf-checkpoint/ffmpeg.cwl rename to ci/test_workflows/clamr-wf-checkpoint/ffmpeg.cwl