populationgenomics / hail

Scalable genomic data analysis.
https://hail.is
MIT License
1 stars 1 forks source link

Upstream v0.2.113 #282

Closed illusional closed 1 year ago

illusional commented 1 year ago
    # Conflicts:
    #       .gitignore
    #       auth/Makefile
    #       batch/batch/driver/instance_collection/pool.py
    #       batch/batch/driver/main.py
    #       build.yaml
    #       ci/create_initial_account.py
    #       docker/Dockerfile.service-base
    #       hail/src/main/scala/is/hail/backend/service/ServiceBackend.scala
    #       hail/src/main/scala/is/hail/backend/service/Worker.scala

Some more challenging conflicts in this release - @lgruen, could you look over the previous files and let me know if you see anything weird.

  1. It looks like they standardised some of the params in one of the jinja renders
image
  1. There were some strange conflicts in build.yaml that I didn't understand. Our logs don't show we really made changes to the section around:
- kind: buildImage2
    name: echo_image
    dockerFile: /io/echo/Dockerfile
    contextPath: /io/echo
    publishAs: echo
    resources:
      storage: 10Gi
      cpu: "2"
      memory: standard
    inputs:
      - from: /repo/echo
        to: /io/echo
    dependsOn:
      - hail_ubuntu_image
      - merge_code
  - kind: deploy
    name: deploy_echo
    namespace:
      valueFrom: default_ns.name
    config: echo/deployment.yaml
    dependsOn:
      - default_ns
      - echo_image
  1. I also noticed they made some fairly chunky changes to docker, which we had changes in files that have since been removed (docker/Dockerfile.service-base)