Skip to content
Snippets Groups Projects
Commit 5c6835e5 authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

Merge branch 'upgrrade-to-htc10' into '2.8.3-DEVELOPMENT'

upgrades all necessary containers to htcondor10

See merge request !1584
parents 6c1cac6b 5ba198a6
No related branches found
No related tags found
2 merge requests!1607merge 2.8.3 to main,!1584upgrades all necessary containers to htcondor10
Pipeline #14445 passed
# Condor central manager image
FROM htcondor/cm:9.0.6-el7
FROM htcondor/cm:10.0.2-el8
# Create vlapipe group
RUN groupadd --gid 6000 vlapipe && \
......
# Condor execute node image
FROM htcondor/execute:9.0.6-el7
FROM htcondor/execute:10.0.2-el8
RUN yum install -y git
......@@ -11,7 +11,7 @@ RUN groupadd --gid 6000 vlapipe && \
# Copy the local env HTCondor config file
COPY ./config/htcondor/00-htcondor-9.0.local.config /etc/condor/config.d/00-htcondor-9.0.config
COPY ./config/htcondor/99-workspaces.conf /root/config/99-workspaces.conf
COPY ./config/htcondor/execute/boot-execute.sh /root/bin/boot-execute.sh
COPY ./config/htcondor/execute/boot-execute-10.sh /root/bin/boot-execute.sh
# Remove file bloking jobs from running as the submit user
RUN rm -rf /etc/condor/config.d/01-slotusers.conf
......
#!/bin/bash
#
# Copyright (C) 2021 Associated Universities, Inc. Washington DC, USA.
#
# This file is part of NRAO Workspaces.
#
# Workspaces is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Workspaces is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Workspaces. If not, see <https://www.gnu.org/licenses/>.
# Set failfast
set -e
set -o pipefail
# Install Python 3.10
PYTHON_VERSION=3.10.9
# Oops - lol. Note to self - never be the dev that caused that: https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
dnf update -y
dnf install gcc openssl-devel bzip2-devel libffi-devel zlib-devel wget make -y
cd /opt
wget https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz
tar xzf Python-$PYTHON_VERSION.tgz && cd Python-$PYTHON_VERSION
# tragic workaround to make Python find openssl 1.1 instead of not finding 1.0
#sed -i 's/PKG_CONFIG openssl /PKG_CONFIG openssl11 /g' configure
./configure --enable-optimizations
make -j 2
make altinstall
cd ..
rm -rf Python-$PYTHON_VERSION.tgz
dnf clean packages
# Make symbolic link of python3 install to where it's installed on dev
mkdir -p /home/ssa/bin
ln -s "$(which python3.10)" /home/ssa/bin/python3.10
\ No newline at end of file
......@@ -35,3 +35,6 @@ FILESYSTEM_DOMAIN = aoc.nrao.edu
C_GAHP_LOG = /tmp/CGAHPLog.$(USERNAME)
C_GAHP_WORKER_THREAD_LOG = /tmp/CGAHPWorkerLog.$(USERNAME)
C_GAHP_WORKER_THREAD_LOCK = /tmp/CGAHPWorkerLock.$(USERNAME)
# HTCondor10 upgrade requirment
TRUST_DOMAIN = $(COLLECTOR_HOST)
\ No newline at end of file
......@@ -26,3 +26,6 @@ SCHEDD_DEBUG = D_ALL
FILESYSTEM_DOMAIN = developer
UID_DOMAIN = local
# HTCondor10 upgrade requirment
TRUST_DOMAIN = $(COLLECTOR_HOST)
\ No newline at end of file
......@@ -35,3 +35,6 @@ FILESYSTEM_DOMAIN = aoc.nrao.edu
C_GAHP_LOG = /tmp/CGAHPLog.$(USERNAME)
C_GAHP_WORKER_THREAD_LOG = /tmp/CGAHPWorkerLog.$(USERNAME)
C_GAHP_WORKER_THREAD_LOCK = /tmp/CGAHPWorkerLock.$(USERNAME)
# HTCondor10 upgrade requirment
TRUST_DOMAIN = $(COLLECTOR_HOST)
\ No newline at end of file
......@@ -35,3 +35,6 @@ FILESYSTEM_DOMAIN = aoc.nrao.edu
C_GAHP_LOG = /tmp/CGAHPLog.$(USERNAME)
C_GAHP_WORKER_THREAD_LOG = /tmp/CGAHPWorkerLog.$(USERNAME)
C_GAHP_WORKER_THREAD_LOCK = /tmp/CGAHPWorkerLock.$(USERNAME)
# HTCondor10 upgrade requirment
TRUST_DOMAIN = $(COLLECTOR_HOST)
\ No newline at end of file
# This is nrao:workflow
ARG LOCAL_OR_SERVER_PEX=local-pex
FROM python:3.10-slim-buster as base
FROM python:3.10-slim-bullseye as base
ARG WS_VERSION=unknown-version
ARG DEPLOY_ENV
......@@ -73,14 +73,14 @@ FROM ${LOCAL_OR_SERVER_PEX} as pex-base
# HTCondor install
USER root
RUN apt update && apt install -y curl gnupg apt-transport-https
RUN curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-9.0-Key | apt-key add -
RUN echo "deb [arch=amd64] https://research.cs.wisc.edu/htcondor/repo/debian/9.0 buster main" > /etc/apt/sources.list.d/htcondor.list
RUN echo "deb-src https://research.cs.wisc.edu/htcondor/repo/debian/9.0 buster main" >> /etc/apt/sources.list.d/htcondor.list
RUN curl -fsSL https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.0-Key | apt-key add -
RUN echo "deb [arch=amd64] https://research.cs.wisc.edu/htcondor/repo/debian/10.0 bullseye main" > /etc/apt/sources.list.d/htcondor.list
RUN echo "deb-src https://research.cs.wisc.edu/htcondor/repo/debian/10.0 bullseye main" >> /etc/apt/sources.list.d/htcondor.list
RUN apt update && apt install -y procps htcondor nano
# HTCondor setup
# Copy over HTCondor submit node config
# 00-htcondor-9.0.config is environment specific, copy handled later
# 00-htcondor-10.0.config is environment specific, copy handled later
COPY /config/htcondor/submit/99-workspaces-submit.${DEPLOY_ENV}.conf /etc/condor/config.d/99-workspaces-submit.${DEPLOY_ENV}.conf
COPY /config/htcondor/submit/nrao-nofile.conf /etc/security/limits.d/nrao-nofile.conf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment