Merge pull request #809 from vvbandeira/fix-docker

vvbandeira · web-flow · commit dc573607b964 · 2023-02-06T11:32:58.000-08:00
Fix docker runtime dependency
diff --git a/docker/Dockerfile.runtime b/docker/Dockerfile.runtime
@@ -2,7 +2,8 @@
 # binaries.
 FROM openroad/centos7-runtime
 RUN yum update -y \
+    && yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
     && yum group install -y "Development Tools" \
     && yum install -y https://www.klayout.org/downloads/CentOS_7/klayout-0.27.1-0.x86_64.rpm \
-    && yum install -y time tcl-devel \
+    && yum install -y tcl tcl-tclreadline-devel tcllib time \
     && pip3 install pandas
diff --git a/jenkins/public_nightly.Jenkinsfile b/jenkins/public_nightly.Jenkinsfile
@@ -101,6 +101,7 @@ pipeline {
                   catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                     if ("${TEST_SLUG}" == 'docker build'){
                       sh "./build_openroad.sh --no_init";
+                      sh "docker run --rm openroad/flow-scripts:latest tools/install/OpenROAD/bin/openroad -help -exit";
                     } else {
                       sh 'nice flow/test/test_helper.sh ${TEST_SLUG}';
                     }
diff --git a/jenkins/public_tests_all.Jenkinsfile b/jenkins/public_tests_all.Jenkinsfile
@@ -79,6 +79,7 @@ pipeline {
                   catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                     if ("${TEST_SLUG}" == 'docker build'){
                       sh "./build_openroad.sh";
+                      sh "docker run --rm openroad/flow-scripts:latest tools/install/OpenROAD/bin/openroad -help -exit";
                     } else {
                       sh 'nice flow/test/test_helper.sh ${TEST_SLUG}';
                     }
diff --git a/jenkins/public_tests_small.Jenkinsfile b/jenkins/public_tests_small.Jenkinsfile
@@ -77,6 +77,7 @@ pipeline {
                   catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                     if ("${TEST_SLUG}" == 'docker build'){
                       sh "./build_openroad.sh";
+                      sh "docker run --rm openroad/flow-scripts:latest tools/install/OpenROAD/bin/openroad -help -exit";
                     } else {
                       sh 'nice flow/test/test_helper.sh ${TEST_SLUG}';
                     }

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ pipeline {`
`101`	`101`	`catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {`
`102`	`102`	`if ("${TEST_SLUG}" == 'docker build'){`
`103`	`103`	`sh "./build_openroad.sh --no_init";`
	`104`	`+ sh "docker run --rm openroad/flow-scripts:latest tools/install/OpenROAD/bin/openroad -help -exit";`
`104`	`105`	`} else {`
`105`	`106`	`sh 'nice flow/test/test_helper.sh ${TEST_SLUG}';`
`106`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ pipeline {`
`79`	`79`	`catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {`
`80`	`80`	`if ("${TEST_SLUG}" == 'docker build'){`
`81`	`81`	`sh "./build_openroad.sh";`
	`82`	`+ sh "docker run --rm openroad/flow-scripts:latest tools/install/OpenROAD/bin/openroad -help -exit";`
`82`	`83`	`} else {`
`83`	`84`	`sh 'nice flow/test/test_helper.sh ${TEST_SLUG}';`
`84`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ pipeline {`
`77`	`77`	`catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {`
`78`	`78`	`if ("${TEST_SLUG}" == 'docker build'){`
`79`	`79`	`sh "./build_openroad.sh";`
	`80`	`+ sh "docker run --rm openroad/flow-scripts:latest tools/install/OpenROAD/bin/openroad -help -exit";`
`80`	`81`	`} else {`
`81`	`82`	`sh 'nice flow/test/test_helper.sh ${TEST_SLUG}';`
`82`	`83`	`}`