From a271c42e6f1e16cb4a1280b92fb25ee4db8a1525 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Fri, 21 Apr 2023 10:15:01 +0200
Subject: [PATCH] update cmake to 3.23 and llvm to 16 in linux image

---
 containers/buildkite-premerge-debian/Dockerfile | 15 ++++++++++++---
 kubernetes/buildkite/linux-agents-test.yaml     |  2 +-
 scripts/buildkite/sample_build.py               | 12 ++++++------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/containers/buildkite-premerge-debian/Dockerfile b/containers/buildkite-premerge-debian/Dockerfile
index 56e938f..1b00797 100644
--- a/containers/buildkite-premerge-debian/Dockerfile
+++ b/containers/buildkite-premerge-debian/Dockerfile
@@ -5,7 +5,7 @@ RUN echo 'intall packages'; \
     apt-get install -y --no-install-recommends \
         locales openssh-client gnupg ca-certificates  \
         zip wget git \
-        cmake gdb build-essential  \
+        gdb build-essential  \
         ninja-build \
         libelf-dev libffi-dev gcc-multilib \
         # for llvm-libc tests that build mpfr and gmp from source
@@ -18,10 +18,19 @@ RUN echo 'intall packages'; \
         # for llvm installation script
         sudo;
 
+# debian stable cmake is 3.18, we need to install a more recent version.
+RUN wget --no-verbose -O /cmake.sh https://github.com/Kitware/CMake/releases/download/v3.23.3/cmake-3.23.3-linux-x86_64.sh; \
+    chmod +x /cmake.sh; \
+    mkdir -p /etc/cmake; \
+    /cmake.sh --prefix=/etc/cmake --skip-license; \
+    ln -s /etc/cmake/bin/cmake /usr/bin/cmake; \
+    cmake --version; \
+    rm /cmake.sh
+
 # LLVM must be installed after prerequsite packages.
-ENV LLVM_VERSION=15
+ENV LLVM_VERSION=16
 RUN echo 'install llvm ${LLVM_VERSION}'; \
-    wget https://apt.llvm.org/llvm.sh; \
+    wget --no-verbose https://apt.llvm.org/llvm.sh; \
     chmod +x llvm.sh; \
     ./llvm.sh ${LLVM_VERSION};\
     apt-get update; \
diff --git a/kubernetes/buildkite/linux-agents-test.yaml b/kubernetes/buildkite/linux-agents-test.yaml
index b5f5111..006c788 100644
--- a/kubernetes/buildkite/linux-agents-test.yaml
+++ b/kubernetes/buildkite/linux-agents-test.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
         - name: test-debian
-          image: gcr.io/llvm-premerge-checks/test:latest
+          image: gcr.io/llvm-premerge-checks/buildkite-premerge-debian:latest
           resources:
             limits:
               cpu: 30
diff --git a/scripts/buildkite/sample_build.py b/scripts/buildkite/sample_build.py
index c48ec3b..1ab1c4e 100644
--- a/scripts/buildkite/sample_build.py
+++ b/scripts/buildkite/sample_build.py
@@ -10,16 +10,16 @@ if __name__ == '__main__':
 
   d = json.dumps({
       'branch': 'main',
-      'commit': 'd3fa067e699cf3ba4bc89f7d51d26f0faed7fa86',
-      'env': {          
+      'commit': '43b38696aa038a83b12850aab25377650e301cde',
+      'env': {
           'ph_log_level': 'DEBUG',
           #'ph_skip_linux': 'skip',
-          #'ph_linux_agents': '{"queue": "linux-google-test"}',
-          'ph_linux_agents': '{"queue": "linux-test"}',
+          'ph_linux_agents': '{"queue": "linux-google-test"}',
+          #'ph_linux_agents': '{"queue": "linux-test"}',
           # 'ph_linux_agents': '{"queue": "linux-clang15-test"}',
-          # 'ph_skip_windows': 'skip',
+          'ph_skip_windows': 'skip',
           #'ph_windows_agents': f'{{"name": "win-dev", "queue": "windows-test"}}',
-         'ph_windows_agents': '{"queue": "windows-test"}',
+         # 'ph_windows_agents': '{"queue": "windows-test"}',
           # 'ph_scripts_refspec': 'windows-vscmd',
           # 'ph_projects': 'all',
           'ph_skip_generated': 'skip',