Skip to content

Commit 0c7e2f8

Browse files
Simran-BSimran-B
committed
Toolchain changes for OEM version
1 parent 4153510 commit 0c7e2f8

File tree

15 files changed

+62
-24
lines changed

15 files changed

+62
-24
lines changed

‎.circleci/base_config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ commands:
2828
2929
git clone --depth 1 --branch $branch_name --recurse-submodules --shallow-submodules --jobs 8 https://github.com/arangodb/arangodb.git /root/project
3030
31-
if [ "<< parameters.version >>" = "3.10" ] || [ "<< parameters.version >>" = "3.11" ]; then
31+
if [ "<< parameters.version >>" = "3.10" ] || [ "<< parameters.version >>" = "3.11" ] || [ "<< parameters.version >>" = "oem" ]; then
3232
ENTERPRISE_BRANCH="<< parameters.version >>"
3333
else
3434
ENTERPRISE_BRANCH="devel"
@@ -131,7 +131,7 @@ commands:
131131
set +e
132132
if [ "<< parameters.version >>" = "3.10" ]; then
133133
cmake --preset enterprise-pr -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_LIBRARY_PATH=$OPENSSL_ROOT_DIR/lib -DUSE_MAINTAINER_MODE=Off -DUSE_GOOGLE_TESTS=Off -DUSE_FAILURE_TESTS=Off
134-
elif [ "<< parameters.version >>" = "3.11" ]; then
134+
elif [ "<< parameters.version >>" = "3.11" ] || [ "<< parameters.version >>" = "oem" ]; then
135135
# The OpenSSL dir that CMake discovers needs to be adjacent to where ldap.h is located, here: /opt
136136
cmake --preset enterprise-pr -DCMAKE_C_COMPILER=/tools/clang -DCMAKE_CXX_COMPILER=/tools/clang++ -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_LIBRARY_PATH=$OPENSSL_ROOT_DIR/lib -DOPENSSL_ROOT_DIR=/opt -DUSE_MAINTAINER_MODE=Off -DUSE_GOOGLE_TESTS=Off -DUSE_FAILURE_TESTS=Off
137137
else

‎.circleci/config.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ parameters:
3939
type: string
4040
default: "undefined"
4141

42+
arangodb-oem:
43+
type: string
44+
default: "undefined"
45+
4246
arangodb-3_12:
4347
type: string
4448
default: "undefined"
@@ -116,7 +120,7 @@ jobs:
116120
117121
python3 generate_config.py \
118122
--workflow << pipeline.parameters.workflow >> \
119-
--arangodb-branches << pipeline.parameters.arangodb-3_10 >> << pipeline.parameters.arangodb-3_11 >> << pipeline.parameters.arangodb-3_12 >> << pipeline.parameters.arangodb-4_0 >> \
123+
--arangodb-branches << pipeline.parameters.arangodb-3_10 >> << pipeline.parameters.arangodb-3_11 >> << pipeline.parameters.arangodb-oem >> << pipeline.parameters.arangodb-3_12 >> << pipeline.parameters.arangodb-4_0 >> \
120124
--arangodb-branch << pipeline.parameters.arangodb-branch >> \
121125
--release-type << pipeline.parameters.release-type >> \
122126
--docs-version << pipeline.parameters.docs-version >> \

‎.circleci/generate_config.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,17 @@ def workflow_generate(config):
135135
}
136136
})
137137

138-
if version in ["3.10", "3.11"]:
138+
if version in ["3.10", "3.11", "oem"]:
139139
if openssl.startswith("3.0"):
140140
compileJob["compile-linux"]["build-image"] = "arangodb/build-alpine-x86_64:3.16-gcc11.2-openssl3.0.10"
141141
elif openssl.startswith("3.1"):
142142
compileJob["compile-linux"]["build-image"] = "arangodb/build-alpine-x86_64:3.16-gcc11.2-openssl3.1.2"
143143
elif openssl.startswith("1.1"):
144144
compileJob["compile-linux"]["build-image"] = "arangodb/build-alpine-x86_64:3.16-gcc11.2-openssl1.1.1s"
145145
else:
146-
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-311:1" # clang-16
147-
else: # build image for 3.12.5 and devel as of 2025-02-04
148-
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-devel:11" # clang-19
146+
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-311:6" # clang-16
147+
else: # build image for 3.12.6 and devel as of 2025-12-03
148+
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-devel:18" # clang-19
149149

150150
print(f"compileJob = {compileJob}")
151151

@@ -191,7 +191,7 @@ def workflow_generate_scheduled(config):
191191
"compile-linux": {
192192
"context": ["sccache-aws-bucket"],
193193
"name": f"compile-{version}",
194-
"arangodb-branch": f"arangodb/enterprise-preview:{version}-nightly" if version in ["3.10", "3.11"] else "arangodb/enterprise-preview:devel-nightly", # TODO: Any other 3.12.x image we could use?
194+
"arangodb-branch": f"arangodb/enterprise-preview:{"3.11-nightly" if version == "oem" else version}-nightly" if version in ["3.10", "3.11", "oem"] else "arangodb/enterprise-preview:devel-nightly", # TODO: Any other 3.12.x image we could use?
195195
"version": version
196196
}
197197
}
@@ -241,17 +241,17 @@ def workflow_release_arangodb(config):
241241
}
242242
}
243243

244-
if args.docs_version in ["3.10", "3.11"]:
244+
if args.docs_version in ["3.10", "3.11", "oem"]:
245245
if openssl.startswith("3.0"):
246246
compileJob["compile-linux"]["build-image"] = "arangodb/build-alpine-x86_64:3.16-gcc11.2-openssl3.0.10"
247247
elif openssl.startswith("3.1"):
248248
compileJob["compile-linux"]["build-image"] = "arangodb/build-alpine-x86_64:3.16-gcc11.2-openssl3.1.2"
249249
elif openssl.startswith("1.1"):
250250
compileJob["compile-linux"]["build-image"] = "arangodb/build-alpine-x86_64:3.16-gcc11.2-openssl1.1.1s"
251251
else:
252-
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-devel:9" # 3.11.13
253-
else: # build image for 3.12.4 and devel as of 2024-11-25
254-
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-devel:9"
252+
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-311:6" # clang-16
253+
else: # build image for 3.12.6 and devel as of 2025-12-03
254+
compileJob["compile-linux"]["build-image"] = "arangodb/ubuntubuildarangodb-devel:18" # clang-19
255255

256256
config["jobs"]["compile-linux"]["steps"].append({
257257
"compile-and-dockerize-arangodb": {
@@ -307,7 +307,7 @@ def workflow_generate_launch_command(config):
307307
branch = args.arangodb_branches[i]
308308

309309
if args.workflow != "generate": #generate scheduled etc.
310-
branch = f"arangodb/enterprise-preview:{version}-nightly" if version in ["3.10", "3.11"] else "arangodb/enterprise-preview:devel-nightly" # TODO: Any other 3.12.x image we could use?
310+
branch = f"arangodb/enterprise-preview:{"3.11-nightly" if version == "oem" else version}-nightly" if version in ["3.10", "3.11", "oem"] else "arangodb/enterprise-preview:devel-nightly" # TODO: Any other 3.12.x image we could use?
311311

312312
if branch == "undefined":
313313
continue

‎CIRCLECI.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ arguments are invoked:
7777
| string | `workflow` | `generate` |
7878
| string | `arangodb-3_10` | [Upstream reference](#upstream-references) for 3.10 |
7979
| string | `arangodb-3_11` | [Upstream reference](#upstream-references) for 3.11 |
80+
| string | `arangodb-oem` | [Upstream reference](#upstream-references) for OEM LTS |
8081
| string | `arangodb-3_12` | [Upstream reference](#upstream-references) for 3.12 |
8182
| string | `generators` | `examples` |
8283
| string | `deploy-url` | `deploy-preview-{PR_NUMBER}` |
@@ -95,6 +96,7 @@ arguments are invoked:
9596
| string | `workflow` | `generate` |
9697
| string | `arangodb-3_10` | [Upstream reference](#upstream-references) for 3.10 |
9798
| string | `arangodb-3_11` | [Upstream reference](#upstream-references) for 3.11 |
99+
| string | `arangodb-oem` | [Upstream reference](#upstream-references) for OEM LTS |
98100
| string | `arangodb-3_12` | [Upstream reference](#upstream-references) for 3.12 |
99101
| string | `generators` | `examples` |
100102
| string | `deploy-url` | `deploy-preview-{PR_NUMBER}` |
@@ -123,6 +125,7 @@ or for multiple versions.
123125
| string | `workflow` | `generate` |
124126
| string | `arangodb-3_10` | [Upstream reference](#upstream-references) for 3.10 |
125127
| string | `arangodb-3_11` | [Upstream reference](#upstream-references) for 3.11 |
128+
| string | `arangodb-oem` | [Upstream reference](#upstream-references) for OEM LTS |
126129
| string | `arangodb-3_12` | [Upstream reference](#upstream-references) for 3.12 |
127130
| string | `generators` | `examples` |
128131
| boolean | `commit-generated` | `true` |
@@ -204,6 +207,7 @@ Invoke Args:
204207
| string | `workflow` | `generate-scheduled` |
205208
| string | `arangodb-3_10` | `arangodb/enterprise-preview:3.10-nightly` |
206209
| string | `arangodb-3_11` | `arangodb/enterprise-preview:3.11-nightly` |
210+
| string | `arangodb-oem` | `arangodb/enterprise-preview:oem-nightly` |
207211
| string | `arangodb-3_12` | `arangodb/enterprise-preview:devel-nightly` |
208212
| string | `generators` | `metrics error-codes exit-codes optimizer options` |
209213
| boolean | `commit-generated` | `true` |

‎site/config/_default/config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module:
2626
#excludeFiles:
2727
# - arangodb/3.10/*
2828
# - arangodb/3.11/*
29+
# - arangodb/oem/*
2930
# - arangodb/4.0/*
3031

3132
- source: content/arangodb/3.12

‎site/data/versions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
deprecated: false
1313
inDevelopment: false
1414

15+
- name: "oem"
16+
version: "OEM LTS"
17+
alias: "oem"
18+
deprecated: false
19+
inDevelopment: false
20+
1521
- name: "3.11"
1622
version: "3.11.14"
1723
alias: "3.11"

‎site/themes/arangodb-docs-theme/layouts/partials/version-selector.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{ $versions := index site.Data.versions "/arangodb/" -}}
44
{{ range $i, $version := $versions -}}
55
<option value="{{ $version.alias }}"{{/* if eq $version.alias "stable" }} selected{{ end */}}>
6-
{{- $version.name }}
6+
{{- $version.name | upper }}{{/* HACK: convert "oem" to uppercase */}}
77
{{- if ne $version.name $version.alias }} ({{ $version.alias }}){{ end -}}
88
</option>
99
{{ end -}}

‎site/themes/arangodb-docs-theme/layouts/shortcodes/full-version.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $ver := (.Get 0) -}}
2-
{{- $versions := (where (index .Site.Data.versions "/arangodb/") "name" $ver) -}}
2+
{{ $versions := (where (index .Site.Data.versions "/arangodb/") "name" $ver) -}}
33
{{ if $versions -}}
44
{{ (index $versions 0).version | htmlEscape -}}
55
{{ else -}}

‎site/themes/arangodb-docs-theme/layouts/shortcodes/program-options.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
{{- if $option.experimental }}
5858
{{- $badges = $badges | append "Experimental"}}
5959
{{- end }}
60-
{{- if or (eq $pageVersion "3.10") (eq $pageVersion "3.11") }}{{/* Only one Edition v3.12.5+ */}}
60+
{{- if or (eq $pageVersion "3.10") (eq $pageVersion "3.11") (eq $pageVersion "oem") }}{{/* Only one Edition v3.12.5+ */}}
6161
{{- if $option.enterpriseOnly }}
6262
{{- $badges = $badges | append "Enterprise Edition" }}
6363
{{- end }}
@@ -96,7 +96,7 @@ Default: `{{ string (index (slice | append .) 0) }}`
9696
{{ . }}
9797
{{ end }}
9898

99-
{{ if or (eq $pageVersion "3.10") (eq $pageVersion "3.11") }}{{/* No Windows/macOS in 3.12+, logic can be removed after 3.11 EOL */}}
99+
{{ if or (eq $pageVersion "3.10") (eq $pageVersion "3.11") (eq $pageVersion "oem") }}{{/* No Windows/macOS in 3.12+ */}}
100100
{{ with $option.os }}
101101
{{ $size := . | len }}
102102
{{ if lt $size 3 }}{{/* needs to be equal to the total number of possible OSes */}}

‎toolchain/arangoproxy/internal/service/service.go‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,23 @@ func init() {
175175
"name": "Business Source License 1.1",
176176
"url": "https://github.com/arangodb/arangodb/blob/devel/LICENSE",
177177
}
178-
if version.Name == "3.10" || version.Name == "3.11" {
178+
displayVersion := version.Version
179+
if version.Name == "3.10" || version.Name == "3.11" || version.Name == "oem" {
180+
branch := version.Name
181+
if version.Name == "oem" {
182+
branch = "3.11.14"
183+
displayVersion = "OEM LTS"
184+
}
179185
license["name"] = "Apache 2.0"
180-
license["url"] = fmt.Sprintf("https://github.com/arangodb/arangodb/blob/%s/LICENSE", version.Name)
186+
license["url"] = fmt.Sprintf("https://github.com/arangodb/arangodb/blob/%s/LICENSE", branch)
181187
}
182188

183189
OpenapiGlobalMap[version.Name] = map[string]interface{}{
184190
"openapi": "3.1.0",
185191
"info": map[string]interface{}{
186-
"title": "ArangoDB Core API",
187-
"summary": "The RESTful HTTP API of the ArangoDB Core Database System",
188-
"version": version.Version,
192+
"title": "ArangoDB API",
193+
"summary": "The RESTful HTTP API of the ArangoDB database system",
194+
"version": displayVersion,
189195
"license": license,
190196
"contact": map[string]interface{}{
191197
"name": "ArangoDB Inc.",

0 commit comments

Comments
 (0)