From 0127bd408d37a425c598d976ac9275ecf96430ed Mon Sep 17 00:00:00 2001 From: Narine Mossikyan Date: Mon, 2 Oct 2023 14:30:59 -0700 Subject: [PATCH] update oms docker image to build opensslv3 (#1542) --- .github/workflows/omsbuild.yml | 6 +++--- build/.travis.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/omsbuild.yml b/.github/workflows/omsbuild.yml index c6bfcea80..f0440cf05 100644 --- a/.github/workflows/omsbuild.yml +++ b/.github/workflows/omsbuild.yml @@ -34,13 +34,13 @@ jobs: ls -la Build-OMS-Agent-for-Linux/ - name: Pull docker image - run: docker pull abenbachir/oms-centos6-x64:latest + run: docker pull narinem/oms-centos6-x64:3.2 - name: Tests - run: docker run --rm -t -v $GITHUB_WORKSPACE/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS abenbachir/oms-centos6-x64:latest /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; ./configure --enable-ulinux; make unittest_100" + run: docker run --rm -t -v $GITHUB_WORKSPACE/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS narinem/oms-centos6-x64:3.2 /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; ./configure --enable-ulinux; make unittest_100" - name: Build - run: docker run --rm -t -v $GITHUB_WORKSPACE/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS abenbachir/oms-centos6-x64:latest /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; make distclean; ./configure --enable-ulinux; make" + run: docker run --rm -t -v $GITHUB_WORKSPACE/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS narinem/oms-centos6-x64:3.2 /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; make distclean; ./configure --enable-ulinux; make" - name: Publish Artifacts uses: actions/upload-artifact@v2 diff --git a/build/.travis.yml b/build/.travis.yml index 01e84ab79..d87d7e125 100644 --- a/build/.travis.yml +++ b/build/.travis.yml @@ -34,10 +34,10 @@ before_script: # pwd: /home/travis/build/Microsoft/Build-OMS-Agent-for-Linux/omsagent/build # Since 'build' is a keyword for travis-CI, change Makefile to substitute 'omsagent/build' instead of 'build' - sed -i 's/(subst \/build,,$(CURDIR))/(subst omsagent\/build,omsagent,$(CURDIR))/' Makefile - - docker pull abenbachir/oms-centos6-x64:latest || true + - docker pull narinem/oms-centos6-x64:3.2 || true script: # System tests are not run because OMS-Agent-for-Linux-testconfig.git is a private repo - - docker run --rm -t -v /home/travis/build/Microsoft/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS abenbachir/oms-centos6-x64:latest /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; ./configure --enable-ulinux; make unittest" - - docker run --rm -t -v /home/travis/build/Microsoft/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS abenbachir/oms-centos6-x64:latest /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; make distclean; ./configure --enable-ulinux; make compile_only" + - docker run --rm -t -v /home/travis/build/Microsoft/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS narinem/oms-centos6-x64:3.2 /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; ./configure --enable-ulinux; make unittest" + - docker run --rm -t -v /home/travis/build/Microsoft/Build-OMS-Agent-for-Linux:/home/scratch/Build-OMS narinem/oms-centos6-x64:3.2 /bin/sh -c "cd /home/scratch/Build-OMS/omsagent/build; make distclean; ./configure --enable-ulinux; make compile_only"