Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions ci/release.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ def buildPodDefinition(workerPodImage, ciUtilsEnabled, kanikoEnabled) {
yaml = """
kind: Pod
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 1
preference:
matchExpressions:
- key: perf
operator: In
values:
- fast
hostAliases:
# Custom set env var
- ip: "${env.JENKINS_IP_ADDRESS}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.intellij.openapi.project.Project
import net.sjrx.intellij.plugins.systemdunitfiles.semanticdata.Validator
import java.util.regex.Pattern

class AllowedCpuSetOptionValue() : OptionValueInformation {
class AllowedCpuSetOptionValue(val name : String) : OptionValueInformation {
override fun getAutoCompleteOptions(project: Project): Set<String> {
return emptySet()
}
Expand Down Expand Up @@ -47,12 +47,20 @@ class AllowedCpuSetOptionValue() : OptionValueInformation {
}

override val validatorName: String
get() = VALIDATOR_NAME
get() = name

companion object {
const val VALIDATOR_NAME = "config_parse_allowed_cpuset"
// Old validator name (before June 28th 2025)
const val OLD_VALIDATOR_NAME = "config_parse_allowed_cpuset"

// New validator name (after June 28th 2025)
const val NEW_VALIDATOR_NAME = "config_parse_unit_cpu_set"

private val CPU_ELEMENT_REGEX= Pattern.compile("^[0-9]+(-[0-9]+)?$")
val validators = mapOf(Validator(VALIDATOR_NAME) to AllowedCpuSetOptionValue())
val validators = mapOf(
Validator(OLD_VALIDATOR_NAME) to AllowedCpuSetOptionValue(OLD_VALIDATOR_NAME),
Validator(NEW_VALIDATOR_NAME) to AllowedCpuSetOptionValue(NEW_VALIDATOR_NAME),
)

}
}
4 changes: 2 additions & 2 deletions systemd-build/Systemd-Builder.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:24.04

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime

Expand All @@ -20,7 +20,7 @@ CMD /systemd-build.sh

# Force cache to be invalidated after this point
ARG BUILDDATE
ENV BUILDDATE ${BUILDDATE:-notset}
ENV BUILDDATE=${BUILDDATE:-notset}

RUN git pull

Expand Down
2 changes: 1 addition & 1 deletion systemd-build/Ubuntu-Units.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:22.04

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get -y install apt-file && apt-file update

Expand Down
Loading