Skip to content

Commit 7e88f8b

Browse files
committed
Use latest 3.11.14 image for OEM LTS
1 parent b6ff937 commit 7e88f8b

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

.circleci/generate_config.py

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,19 @@ def workflow_generate_scheduled(config):
186186

187187
for i in range(len(versions)):
188188
version = versions[i]["name"]
189+
190+
if version in ["3.10", "3.11"]:
191+
imageVersion = f"{version}-nightly"
192+
elif version == "oem":
193+
imageVersion = findOemVersion()
194+
else:
195+
imageVersion = "devel-nightly"
189196

190197
compileJob = {
191198
"compile-linux": {
192199
"context": ["sccache-aws-bucket"],
193200
"name": f"compile-{version}",
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?
201+
"arangodb-branch": f"arangodb/enterprise-preview:{imageVersion}", # TODO: Any other 3.12.x image we could use?
195202
"version": version
196203
}
197204
}
@@ -307,7 +314,13 @@ def workflow_generate_launch_command(config):
307314
branch = args.arangodb_branches[i]
308315

309316
if args.workflow != "generate": #generate scheduled etc.
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?
317+
if version in ["3.10", "3.11"]:
318+
imageVersion = f"{version}-nightly"
319+
elif version == "oem":
320+
imageVersion = findOemVersion()
321+
else:
322+
imageVersion = "devel-nightly"
323+
branch = f"arangodb/enterprise-preview:{imageVersion}" # TODO: Any other 3.12.x image we could use?
311324

312325
if branch == "undefined":
313326
continue
@@ -437,6 +450,13 @@ def findOpensslVersion(branch):
437450
version = line.replace("OPENSSL_LINUX", "").replace(" ", "").replace("\"", "")
438451
return version
439452

453+
def findOemVersion():
454+
r = requests.get(f'https://raw.githubusercontent.com/arangodb/arangodb/3.11.14/ARANGO-VERSION')
455+
print(f"Find latest (hotfix) version of OEM LTS")
456+
print(f"Github response: {r.text}")
457+
version = r.text.strip()
458+
return version
459+
440460

441461
## MAIN
442462

CIRCLECI.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ Documentation pull requests specify upstream references like so:
139139
```markdown
140140
- 3.10:
141141
- 3.11: https://github.com/arangodb/arangodb/pull/12345
142+
- OEM: arangodb/enterprise-preview:3.11.14.2
142143
- 3.12: arangodb/enterprise-preview:devel-nightly
143144
```
144145

@@ -151,6 +152,10 @@ used by the GitHub integration to determine the feature branch to compile and
151152
use for generating examples. Do not specify a link when manually triggering a
152153
pipeline in CircleCI but the **branch name** (like `feature/new-aql-function`)!
153154

155+
For OEM, make sure to use the latest hotfix version of 3.11.14 (which is the
156+
OEM LTS version) when specifying a Docker image. You can find the version in
157+
<https://github.com/arangodb/arangodb/blob/3.11.14/ARANGO-VERSION>.
158+
154159
For 3.12, an ArangoDB Enterprise Edition image hosted on
155160
[Docker Hub](https://hub.docker.com/) is specified. Using Docker images has the
156161
advantage that the compilation of ArangoDB can be skipped, making the example
@@ -207,7 +212,7 @@ Invoke Args:
207212
| string | `workflow` | `generate-scheduled` |
208213
| string | `arangodb-3_10` | `arangodb/enterprise-preview:3.10-nightly` |
209214
| string | `arangodb-3_11` | `arangodb/enterprise-preview:3.11-nightly` |
210-
| string | `arangodb-oem` | `arangodb/enterprise-preview:oem-nightly` |
215+
| string | `arangodb-oem` | `arangodb/enterprise-preview:3.11.14.2` (use latest hotfix) |
211216
| string | `arangodb-3_12` | `arangodb/enterprise-preview:devel-nightly` |
212217
| string | `generators` | `metrics error-codes exit-codes optimizer options` |
213218
| boolean | `commit-generated` | `true` |

0 commit comments

Comments
 (0)