-if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then
- cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0)
-fi
+# This defines python_sdk_version and cwl_runner_version with python-style
+# package suffixes (.dev/rc)
+calculate_python_sdk_cwl_package_versions
+
+set -x
+docker build --no-cache \
+ --build-arg sdk=$sdk \
+ --build-arg runner=$runner \
+ --build-arg salad=$salad \
+ --build-arg cwltool=$cwltool \
+ --build-arg pythoncmd=$py \
+ --build-arg pipcmd=$pipcmd \
+ --build-arg cwlutils=$cwlutils \
+ -f "$WORKSPACE/sdk/dev-jobs.dockerfile" \
+ -t arvados/jobs:$cwl_runner_version \
+ "$WORKSPACE/sdk"