DEVOPS-1689 Update download_runner.sh

.github/workflows/ee2-tests.yml

@@ -64,6 +64,8 @@ jobs:
           python-version: "3.10.14"
       - name: Install dependencies
         run: |
+          pip install htcondor
+          pip freeze | grep htcondor
           pip install -r requirements.txt
           git clone https://github.com/kbase/jars /opt/jars
       - name: Set MongoDB Version and Init Path

Dockerfile

@@ -1,5 +1,5 @@
 FROM kbase/sdkpython:3.8.0
 MAINTAINER KBase Developer
 
 RUN apt-get clean all && apt-get update --fix-missing -y && apt-get upgrade -y
 
@@ -12,7 +12,10 @@
 RUN mkdir -p /etc/apt/sources.list.d
 
 # Install condor
-RUN curl -fsSL https://get.htcondor.org | /bin/bash -s -- --no-dry-run
+
+#RUN curl -fsSL https://get.htcondor.org | /bin/bash -s -- --no-dry-run
+
+RUN  DEBIAN_FRONTEND=noninteractive apt-get install -y htcondor
 
 # Install jars for testing purposes
 # Uncomment this if you want to run tests inside the ee2 container on MacOSX
@@ -38,6 +41,7 @@
 RUN pip install --upgrade pip && python -V
 COPY ./requirements.txt /kb/module/requirements.txt
 
+
 RUN pip install -r /kb/module/requirements.txt
 RUN adduser --disabled-password --gecos '' -shell /bin/bash kbase
 # -----------------------------------------

Pipfile

@@ -28,7 +28,7 @@ gunicorn = "==20.0.4"
 h11 = "==0.8.1"
 h2 = "==3.1.0"
 hpack = "==3.0.0"
-htcondor = "==8.9.8"
+htcondor = "==25.2.1"
 httpcore = "==0.3.0"
 httptools = "==0.0.13"
 hyperframe = "==5.2.0"

RELEASE_NOTES.md

@@ -1,6 +1,9 @@
 # execution_engine2 (ee2) release notes
 =========================================
 
+## 0.0.16
+- Update JobRunner to no longer use ee2 branch (requires sanic==21.12.2 to be installed on the workers)
+
 ## 0.0.15
 - Update JobRunner and Execution Engine to substitute internal urls to go through cloudflare
 

kbase.yml

@@ -8,7 +8,7 @@ service-language:
     python
 
 module-version:
-    0.0.15
+    0.0.16
 
 owners:
-    [bsadkhin, tgu2, wjriehl, gaprice]
+    [bsadkhin, tgu2, wjriehl, gaprice]

requirements.txt

@@ -9,7 +9,7 @@ coverage==5.5
 docker==5.0.0
 gevent==24.2.1 ; python_version >= "3.10" and python_version < "4.0"
 gunicorn==20.1.0
-htcondor==23.8.1
+htcondor==25.2.1
 Jinja2==3.0.1
 JSONRPCBase==0.2.0
 mock==4.0.3

scripts/download_runner.sh

@@ -4,7 +4,7 @@
 set -x
 runner_dir=/runner
 mkdir -p ${runner_dir} && cd ${runner_dir} && rm -rf JobRunner
-git clone --single-branch --branch ee2 https://github.com/kbase/JobRunner.git
+git clone --single-branch --branch main https://github.com/kbase/JobRunner.git
 rm -rf JobRunner/test
-rm -rf Jobrunner/.git
+rm -rf JobRunner/.git
 tar -czvf ${runner_dir}/JobRunner.tgz JobRunner