Skip to content

Update the default HTCondor and packer versions #5921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toscar82 wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Update the default HTCondor and packer versions #5921

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c6b3849
Update default HTCondor version for 25.
toscar82 Jul 8, 2026
0942260
Update install-htcondor.yaml for v25
toscar82 Jul 8, 2026
412d190
Update update-dependencies.sh
toscar82 Jul 8, 2026
61ef1b4
Update Dockerfile
toscar82 Jul 8, 2026
8a2f01f
Update checksums_generated.go
toscar82 Jul 8, 2026
6db1d04
Update autoscaler.py
toscar82 Jul 8, 2026
49e6165
Remove extra comment and fix a typo
Jul 9, 2026
155bf44
remove commented descriptions
Jul 9, 2026
28b5b3a
update the condor version in the README.md
Jul 9, 2026
a004032
result of go fmt
Jul 10, 2026
2f5188a
fix typo of duplicate variable
Jul 13, 2026
d46c380
Fix HTCondor autoscaler dependencies for v25 upgrade by explicitly us…
Neelabh94 Jul 17, 2026
c6a0786
Revert "Update update-dependencies.sh"
toscar82 Jul 29, 2026
022b818
Revert "Update Dockerfile"
toscar82 Jul 29, 2026
965ade1
fix merge
toscar82 Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion community/modules/scripts/htcondor-install/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ No resources.

| Name | Description | Type | Default | Required |
| ---- | ----------- | ---- | ------- | :------: |
| <a name="input_condor_version"></a> [condor\_version](#input\_condor\_version) | Yum/DNF-compatible version string; leave unset to use latest 23.0 LTS release (examples: "23.0.0","23.*")) | `string` | `"23.*"` | no |
| <a name="input_condor_version"></a> [condor\_version](#input\_condor\_version) | Yum/DNF-compatible version string; leave unset to use latest 25.0 LTS release (examples: "25.0.0","25.*") | `string` | `"25.*"` | no |
| <a name="input_enable_docker"></a> [enable\_docker](#input\_enable\_docker) | Install and enable docker daemon alongside HTCondor | `bool` | `true` | no |
| <a name="input_http_proxy"></a> [http\_proxy](#input\_http\_proxy) | Set system default web (http and https) proxy for Windows HTCondor installation | `string` | `""` | no |
| <a name="input_python_windows_installer_url"></a> [python\_windows\_installer\_url](#input\_python\_windows\_installer\_url) | URL of Python installer for Windows | `string` | `"https://www.python.org/ftp/python/3.11.9/python-3.11.9-amd64.exe"` | no |
Expand Down
43 changes: 31 additions & 12 deletions community/modules/scripts/htcondor-install/files/autoscaler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,20 @@
# Script for resizing managed instance group (MIG) cluster size based
# on the number of jobs in the Condor Queue.

from absl import app
from absl import flags
from collections import OrderedDict
from datetime import datetime
from pprint import pprint
from googleapiclient import discovery
from oauth2client.client import GoogleCredentials

import argparse
import os
import math
import htcondor
import classad
import time
import htcondor2 as htcondor
import classad2 as classad

parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser.add_argument("--p", required=True, help="Project id", type=str)
Expand Down Expand Up @@ -223,8 +227,8 @@ def scale(self):

print(f"Last negotiation cycle occurred at: {datetime.fromtimestamp(last_negotiation_cycle_time)}")
idle_job_query = classad.ExprTree(f"JobStatus == 1 && QDate < {last_negotiation_cycle_time}")
idle_job_ads = schedd.query(constraint=idle_job_query.and_(spot_query),
projection=job_attributes)
combined_query_str = combined_query_str = f'JobStatus == 1 && QDate < {last_negotiation_cycle_time} && RequireId == "{self.instance_group_manager}"'
Comment thread
toscar82 marked this conversation as resolved.
Outdated
idle_job_ads = schedd.query(constraint=combined_query_str, projection=job_attributes)

total_idle_request_cpus = sum(j[REQUEST_CPUS_ATTRIBUTE] for j in idle_job_ads)
print(f"Total CPUs requested by idle jobs: {total_idle_request_cpus}")
Expand Down Expand Up @@ -263,19 +267,34 @@ def scale(self):

# Find VMs that are idle (no dynamic slots created from partitionable
# slots) in the MIG handled by this autoscaler
filter_idle_vms = classad.ExprTree("PartitionableSlot && NumDynamicSlots==0")
filter_claimed_vms = classad.ExprTree("PartitionableSlot && NumDynamicSlots>0")
filter_idle_vms = classad.ExprTree(f"PartitionableSlot && NumDynamicSlots==0")
filter_claimed_vms = classad.ExprTree(f"PartitionableSlot && NumDynamicSlots>0")
filter_mig = classad.ExprTree(f"regexp(\".*/{self.instance_group_manager}$\", CloudCreatedBy)")
combined_node_query = (
f'PartitionableSlot && NumDynamicSlots == 0 && '
f'regexp(".*/{self.instance_group_manager}$", CloudCreatedBy)'
)

filter_mig_str = f"regexp(\".*/{self.instance_group_manager}$\", CloudCreatedBy)"
filter_claimed_vms_str = "PartitionableSlot && NumDynamicSlots>0"

# A full list of Machine (StartD) ClassAd attributes can be found at
# https://htcondor.readthedocs.io/en/latest/classad-attributes/machine-classad-attributes.html
idle_node_ads = coll.query(htcondor.AdTypes.Startd,
constraint=filter_idle_vms.and_(filter_mig),
projection=["Machine", "CloudZone"])

idle_node_ads = coll.query(
ad_type=htcondor.AdTypes.Startd,
constraint=combined_node_query,
projection=["Machine", "CloudZone"]
)

NODENAME_ATTRIBUTE = "Machine"
claimed_node_ads = coll.query(htcondor.AdTypes.Startd,
constraint=filter_claimed_vms.and_(filter_mig),
projection=[NODENAME_ATTRIBUTE])
combined_constraint = classad.ExprTree(f"({filter_mig_str}) && ({filter_claimed_vms_str})")

claimed_node_ads = coll.query(
htcondor.AdType.Startd, # Note: htcondor.AdTypes.Startd is replaced by htcondor.DaemonTypes.Startd or AdTypes if still supported, but DaemonTypes is standard in v2.
constraint=combined_constraint,
projection=[NODENAME_ATTRIBUTE]
)
claimed_nodes = [ ad[NODENAME_ATTRIBUTE].split(".")[0] for ad in claimed_node_ads]

# treat OrderedDict as a set by ignoring key values; this set will
Expand Down
10 changes: 5 additions & 5 deletions community/modules/scripts/htcondor-install/files/install-htcondor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# The instructions for installing HTCondor may change with time, although we
# anticipate that they will stay fixed for the 23.0 releases. Find up-to-date
# anticipate that they will stay fixed for the 25.0 releases. Find up-to-date
# recommendations at:
## https://htcondor.readthedocs.io/en/latest/getting-htcondor/from-our-repositories.html

Expand All @@ -22,7 +22,7 @@
hosts: all
vars:
enable_docker: true
htcondor_key: https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.0-Key
htcondor_key: https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-25.0-Key
docker_key: https://download.docker.com/linux/centos/gpg
become: true
module_defaults:
Expand All @@ -47,16 +47,16 @@
- name: Enable HTCondor LTS Release repository
ansible.builtin.yum_repository:
name: htcondor-feature
description: HTCondor LTS Release (23.0)
description: HTCondor LTS Release (25.0)
file: htcondor
baseurl: https://research.cs.wisc.edu/htcondor/repo/23.0/el$releasever/$basearch/release
baseurl: https://research.cs.wisc.edu/htcondor/repo/25.0/el$releasever/$basearch/release
gpgkey: "{{ htcondor_key }}"
gpgcheck: true
repo_gpgcheck: true
priority: "90"
- name: Install HTCondor
ansible.builtin.yum:
name: condor-{{ condor_version | default("23.*") | string }}
name: condor-{{ condor_version | default("25.*") | string }}
state: present
- name: Ensure token directory
ansible.builtin.file:
Expand Down
10 changes: 5 additions & 5 deletions community/modules/scripts/htcondor-install/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ variable "enable_docker" {
}

variable "condor_version" {
description = "Yum/DNF-compatible version string; leave unset to use latest 23.0 LTS release (examples: \"23.0.0\",\"23.*\"))"
description = "Yum/DNF-compatible version string; leave unset to use latest 25.0 LTS release (examples: \"25.0.0\",\"25.*\")"
type = string
default = "23.*"
default = "25.*"

validation {
error_message = "var.condor_version must be set to \"23.*\" for latest 23.0 release or to a specific \"23.0.y\" release."
condition = var.condor_version == "23.*" || (
error_message = "var.condor_version must be set to \"25.*\" for latest 25.0 release or to a specific \"25.0.y\" release."
condition = var.condor_version == "25.*" || (
length(split(".", var.condor_version)) == 3 && alltrue([
for v in split(".", var.condor_version) : can(tonumber(v))
]) && split(".", var.condor_version)[0] == "23"
]) && split(".", var.condor_version)[0] == "25"
&& split(".", var.condor_version)[1] == "0"
)
}
Expand Down
40 changes: 20 additions & 20 deletions pkg/dependencies/checksums_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/cloud-build/images/cluster-toolkit-dockerfile/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN wget -q "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terra
rm terraform.zip

# Install Packer
ARG PACKER_VERSION=1.15.3
ARG PACKER_VERSION=1.15.4
RUN wget -q "https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERSION}_linux_amd64.zip" -O packer.zip && \
unzip -o packer.zip && \
mv packer /usr/local/bin/ && \
Expand Down
2 changes: 1 addition & 1 deletion tools/update-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
set -euo pipefail

TERRAFORM_VERSION="1.12.2"
PACKER_VERSION="1.15.3"
PACKER_VERSION="1.15.4"
Comment thread
toscar82 marked this conversation as resolved.
Outdated

@Neelabh94 Neelabh94 Jul 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@toscar82 , could you please revert this change (packer version update) from the PR? Since this affects a core part of the CTK code, we prefer to handle the packer version upgrade internally to ensure thorough testing and compatibility.

cc: @arpit974

@toscar82 toscar82 Jul 29, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Neelabh94 , packer has been reverted.

I wish the previous packer version changes had this thorough test as well.

My whole problem started with v1..94.0
When someone changed this requirement while the packer version was older.

cluster-toolkit/modules/packer/custom-image/versions.pkr.hcl

Line 16 in 22679e0

required_version = ">= 1.15.3, < 2.0.0"

@Neelabh94 Neelabh94 Jul 30, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the prompt update!
We're trying to be more thorough to prevent similar issue by testing core version bumps more rigorously on our end now. I've re-triggered the tests, and we'll get the HTCondor portion of this PR merged in once they pass.

@toscar82 toscar82 Jul 30, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you Neelabh!

Once it is merged, then I'll prepare the next PR with extension of HTCondor project.

This small change was to learn the process.

OUTPUT_FILE="pkg/dependencies/checksums_generated.go"

mkdir -p "$(dirname "$OUTPUT_FILE")"
Expand Down
Loading