From a440c2f3db303c7cde1961256159a1c8cf63260f Mon Sep 17 00:00:00 2001
From: Raghunandan Netrapalli Madhusudhan <raghunandan.madhusudhan@in-tech.com>
Date: Sat, 29 Mar 2025 15:09:33 +0100
Subject: [PATCH] Use gtgen simulator 11.3.0
---
utils/ci/Jenkinsfile | 8 ++++----
utils/ci/scripts/55_endtoend.sh | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/utils/ci/Jenkinsfile b/utils/ci/Jenkinsfile
index 03938d596..fff5f5967 100644
--- a/utils/ci/Jenkinsfile
+++ b/utils/ci/Jenkinsfile
@@ -14,9 +14,9 @@ pipeline {
parameters {
booleanParam(name: 'BUILD_DOCKER_IMAGE', defaultValue: false, description: 'Force docker image (re-)build')
string(name: 'OPTESTRUNNER_URL', defaultValue: 'https://download.eclipse.org/openpass/snapshots/opTestrunner/pytest_optestrunner-1.1-py3-none-any.whl', description: 'URL to download opTestrunner binaries')
- string(name: 'GECCO_URL', defaultValue: 'https://ci.eclipse.org/openpass/job/gecco/job/develop/lastSuccessfulBuild/artifact/artifacts/gecco.tar.gz', description: 'URL to download gecco binaries')
- string(name: 'GTGEN_CLI_URL', defaultValue: 'https://ci.eclipse.org/openpass/job/GT-Gen-Simulator-PreMerge-Gate/view/tags/job/v11.2.0/lastSuccessfulBuild/artifact/artifacts/gtgen-cli_1.1.0_amd64.deb', description: 'URL to download gtgen cli binaries')
- string(name: 'GTGEN_SIM_URL', defaultValue: 'https://ci.eclipse.org/openpass/job/GT-Gen-Simulator-PreMerge-Gate/view/tags/job/v11.2.0/lastSuccessfulBuild/artifact/artifacts/gtgen-simulator_11.2.0_amd64.deb', description: 'URL to download gtgen simulator binaries')
+ string(name: 'GECCO_URL', defaultValue: 'https://ci.eclipse.org/openpass/job/gecco/view/change-requests/job/MR-3/lastSuccessfulBuild/artifact/artifacts/gecco.tar.gz', description: 'URL to download gecco binaries')
+ string(name: 'GTGEN_CLI_URL', defaultValue: 'https://ci.eclipse.org/openpass/job/GT-Gen-Simulator-PreMerge-Gate/view/tags/job/v11.3.0/lastSuccessfulBuild/artifact/artifacts/gtgen-cli_1.1.0_amd64.deb', description: 'URL to download gtgen cli binaries')
+ string(name: 'GTGEN_SIM_URL', defaultValue: 'https://ci.eclipse.org/openpass/job/GT-Gen-Simulator-PreMerge-Gate/view/tags/job/v11.3.0/lastSuccessfulBuild/artifact/artifacts/gtgen-simulator_11.3.0_amd64.deb', description: 'URL to download gtgen simulator binaries')
}
options {
checkoutToSubdirectory('repo')
@@ -110,7 +110,7 @@ spec:
container('openpass-build') {
sh 'bash repo/utils/ci/scripts/pull_gecco.sh'
sh 'bash repo/utils/ci/scripts/pull_optestrunner.sh'
- sh 'bash repo/utils/ci/scripts/build_gtgen.sh'
+ sh 'bash repo/utils/ci/scripts/pull_gtgen.sh'
}
}
}
diff --git a/utils/ci/scripts/55_endtoend.sh b/utils/ci/scripts/55_endtoend.sh
index 35eb9889a..f8c594078 100755
--- a/utils/ci/scripts/55_endtoend.sh
+++ b/utils/ci/scripts/55_endtoend.sh
@@ -24,13 +24,13 @@ OP_REPO_DIR="${OP_REPO_DIR:=$SCRIPT_DIR/../../..}"
if [[ -z "${GECCO_DIR}" ]]; then
# If not defined, set a default value
- GTGEN_DIR="$SCRIPT_DIR/../../../../gtgen_repo"
+ GTGEN_DIR="$SCRIPT_DIR/../../../../gtgen_cli"
GECCO_DIR="$SCRIPT_DIR/../../../../gecco"
echo "WARN: GECCO_DIR variable is not set. Setting it to:
GECCO_DIR is ${GECCO_DIR}"
fi
-GTGEN_CLI_PATH="$GTGEN_DIR/gt-gen-simulator-v11.1.0/bazel-out/k8-opt/bin/Cli"
+GTGEN_CLI_PATH="$GTGEN_DIR"
venv_python_executable="${OP_REPO_DIR}/.env/bin/python3"
commonFolder=$GECCO_DIR/gecco/examples/Common
--
GitLab