Merge branch 'master' into narinem_opensslv3

microsoft · Oct 2, 2023 · 875e340 · 875e340
2 parents 18ab588 + 0127bd4
commit 875e340
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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"