From 702469a193f2ee41780669e91ba32d63a0053338 Mon Sep 17 00:00:00 2001
From: Raghunandan Netrapalli Madhusudhan <raghunandan.madhusudhan@in-tech.com>
Date: Thu, 20 Mar 2025 13:15:26 +0100
Subject: [PATCH] build docker image for opTestrunner
---
utils/Dockerfile | 59 --------------------------------------------
utils/ci/Jenkinsfile | 4 +--
2 files changed, 2 insertions(+), 61 deletions(-)
diff --git a/utils/Dockerfile b/utils/Dockerfile
index 4e9e8894a..6ef95d22d 100644
--- a/utils/Dockerfile
+++ b/utils/Dockerfile
@@ -16,67 +16,8 @@ FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && apt-get -qq dist-upgrade && apt-get install -qq -y --no-install-recommends \
- antlr4 \
- build-essential \
- ca-certificates \
- ccache \
- cmake \
- clang-format-15 \
- clang-tidy-14 \
- curl \
- doxygen \
- g++ \
- gcc \
- git \
- google-mock \
- googletest \
- graphviz \
- lcov \
- libboost-filesystem-dev \
- libgmock-dev \
- libgtest-dev \
- libprotobuf-dev \
- libantlr4-runtime4.9 \
- libantlr4-runtime-java \
- libantlr4-runtime-dev \
- openjdk-17-jre \
- pkg-config \
- protobuf-compiler \
python3 \
python3-distutils \
python3-pip \
python3-venv \
- uuid-dev \
&& apt-get -qq clean
-
-RUN apt-get install -qq -y --no-install-recommends \
- texlive-base \
- texlive-latex-extra
-
-RUN apt-get install -qq -y --no-install-recommends \
- dvipng
-
-# Create a folder
-RUN mkdir -p /opsimulation/conan
-
-# set the folder as a conan home
-ENV CONAN_HOME='/opsimulation/conan'
-
-ENV PYTHON_EXECUTABLE=python3
-
-# copy the required contents from the repo to build conan packages
-COPY repo/utils/ci/scripts/15_prepare_thirdParty.sh repo/utils/ci/scripts/15_prepare_thirdParty.sh
-COPY repo/utils/ci/conan repo/utils/ci/conan
-
-# copy requirements.txt file to install python packages
-COPY repo/requirements.txt repo/requirements.txt
-COPY repo/doc/source/requirements.txt repo/doc/source/requirements.txt
-COPY repo/sim/tests/endToEndTests/pyOpenPASS/requirements.txt repo/sim/tests/endToEndTests/pyOpenPASS/requirements.txt
-
-# install python packages
-RUN pip install -r repo/requirements.txt
-
-# Create conan packages and make it available in /opsimulation/conan, allows not to build everytime
-RUN repo/utils/ci/scripts/15_prepare_thirdParty.sh && \
- rm -r repo deps && \
- chmod -R 777 /opsimulation/conan
diff --git a/utils/ci/Jenkinsfile b/utils/ci/Jenkinsfile
index ee9f73d10..aca221c41 100644
--- a/utils/ci/Jenkinsfile
+++ b/utils/ci/Jenkinsfile
@@ -22,8 +22,8 @@ pipeline {
buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '2'))
}
environment {
- IMAGE_NAME = "eclipseopenpass/opsim-ci"
- IMAGE_TAG = "v1.2.1"
+ IMAGE_NAME = "eclipseopenpass/optr-ci"
+ IMAGE_TAG = "v0.0.1"
REPO_URL = "https://gitlab.eclipse.org/eclipse/openpass/opSimulation.git"
DOCKERFILE_PATH = "utils/Dockerfile"
}
--
GitLab