Skip to content

Commit a0cbfe0

Browse files
omajidaslicerh
authored andcommitted
Fix 2.1 tests and cccp ids for CentOS (#208)
.NET Core 2.1 is now built in CentOS. Update the tests and the build yml files to work for that. Also update the CentOS dockerfile to match the RHEL 7 dockerfile.
1 parent c04ecee commit a0cbfe0

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

2.1/build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM dotnet/dotnet-21-runtime-centos7
22
# This image provides a .NET Core 2.1 environment you can use to run your .NET
33
# applications.
44

5-
ENV PATH=/opt/app-root/src/.local/bin:/opt/app-root/src/bin:/opt/app-root/dotnet_tools:/opt/app-root/node_modules/.bin:${PATH} \
5+
ENV PATH=/opt/app-root/src/.local/bin:/opt/app-root/src/bin:/opt/app-root/.dotnet/tools:/opt/app-root/node_modules/.bin:${PATH} \
66
STI_SCRIPTS_PATH=/usr/libexec/s2i
77

88
LABEL io.k8s.description="Platform for building and running .NET Core 2.1 applications" \

2.1/build/cccp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This is for the purpose of building this container
22
# on the centos container pipeline.
3-
job-id: dotnet-20-centos7
3+
job-id: dotnet-21-centos7

2.1/build/test/run

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ test_dir="$(readlink -zf $(dirname "${BASH_SOURCE[0]}"))"
3131
source ${test_dir}/testcommon
3232

3333
if [ "$BUILD_CENTOS" = "true" ]; then
34-
sdk_default_version="2.1.300"
35-
sdk_latest_version="2.1.300"
36-
sdk_versions=( "2.1.300" )
34+
sdk_default_version="2.1.302"
35+
sdk_latest_version="2.1.302"
36+
sdk_versions=( "2.1.302" )
3737
else
3838
sdk_default_version="2.1.301"
3939
sdk_latest_version="2.1.301"

2.1/runtime/cccp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This is for the purpose of building this container
22
# on the centos container pipeline.
3-
job-id: dotnet-20-runtime-centos7
3+
job-id: dotnet-21-runtime-centos7

0 commit comments

Comments
 (0)