label

Author: robbycochran

.github/workflows/collector-builder.yml

@@ -17,6 +17,7 @@ env:
   COLLECTOR_TAG: ${{ inputs.collector-tag }}
   DEFAULT_BUILDER_TAG: master
   ANSIBLE_CONFIG: ${{ github.workspace }}/ansible/ansible.cfg
+  USE_CCACHE: ${{ !contains(github.event.pull_request.labels.*.name, 'no-ccache') }}
 
 jobs:
   builder-needs-rebuilding:
@@ -145,6 +146,7 @@ jobs:
             echo "rhacs_eng_password: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}"
             echo "collector_git_ref: ${{ github.ref }}"
             echo "collector_builder_tag: ${{ env.COLLECTOR_BUILDER_TAG }}"
+            echo "use_ccache: ${USE_CCACHE}"
           } > ${{ github.workspace }}/ansible/secrets.yml
 
       - name: Build images
@@ -182,14 +184,6 @@ jobs:
         run: |
           make -C ansible destroy-vms
 
-      - name: Store artifacts
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: builder-${{ matrix.arch }}-logs
-          path: |
-            ${{ github.workspace }}/build_builder_image.log
-
   create-multiarch-manifest:
     needs:
     - build-builder-image

.github/workflows/collector.yml

@@ -26,6 +26,7 @@ env:
   ANSIBLE_CONFIG: ${{ github.workspace }}/ansible/ansible.cfg
   TRACE_SINSP_EVENTS: ${{ github.event_name == 'pull_request' }}
   ADDRESS_SANITIZER: ${{ contains(github.event.pull_request.labels.*.name, 'address-sanitizer') }}
+  USE_CCACHE: ${{ !contains(github.event.pull_request.labels.*.name, 'no-ccache') }}
 
 jobs:
   build-collector-image:
@@ -72,6 +73,7 @@ jobs:
           collector_tag: ${{ inputs.collector-tag }}
           debug_mode: ${{ github.event_name == 'pull_request' }}
           driver_version: ${DRIVER_VERSION}
+          use_ccache: ${USE_CCACHE}
           EOF
 
       - name: Build images
@@ -156,6 +158,7 @@ jobs:
           collector_image: ${{ inputs.collector-image }}
           collector_tag: ${{ inputs.collector-tag }}
           debug_mode: ${{ github.event_name == 'pull_request' }}
+          use_ccache: ${USE_CCACHE}
           EOF
 
       - name: Build ${{ matrix.arch }} image

Makefile

@@ -30,8 +30,7 @@ ifneq ($(BUILD_BUILDER_IMAGE), false)
 		--build-arg USE_CCACHE="${USE_CCACHE}" \
 		-t quay.io/stackrox-io/collector-builder:$(COLLECTOR_BUILDER_TAG) \
 		-f "$(CURDIR)/builder/Dockerfile" \
-		"$(CURDIR)/builder" \
-		2>&1 | tee build_builder_image.log
+		"$(CURDIR)/builder"
 endif
 
 collector: check-builder

Makefile-constants.mk

@@ -10,6 +10,7 @@ HOST_ARCH := $(shell uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
 PLATFORM ?= "linux/$(HOST_ARCH)"
 
 USE_VALGRIND ?= false
+USE_CCACHE ?= false
 ADDRESS_SANITIZER ?= false
 CMAKE_BUILD_TYPE ?= Release
 CMAKE_BASE_DIR = cmake-build-$(shell echo $(CMAKE_BUILD_TYPE) | tr A-Z a-z)-$(HOST_ARCH)
@@ -19,4 +20,3 @@ BPF_DEBUG_MODE ?= false
 
 COLLECTOR_BUILD_CONTEXT = collector/
 COLLECTOR_BUILDER_NAME ?= collector_builder_$(HOST_ARCH)
-USE_CCACHE ?= true

ansible/ci-build-builder.yml

@@ -6,6 +6,7 @@
     BUILD_BUILDER_IMAGE: "true"
     COLLECTOR_BUILDER_TAG: "{{ collector_builder_tag }}"
     PLATFORM: "linux/{{ arch }}"
+    USE_CCACHE: "{{ use_ccache }}"
 
   vars:
     collector_root: "{{ ansible_env.HOME }}/collector"
@@ -41,46 +42,37 @@
       ansible.builtin.stat:
         path: "{{ github_workspace }}/{{ ccache_path }}"
       register: ccache_check
-      when: arch == "s390x"
+      when: use_ccache and arch == "s390x"
 
     - name: Copy ccache
       ansible.builtin.copy:
         src: "{{ github_workspace }}/{{ ccache_path }}"
         dest: "{{ collector_root }}/{{ ccache_dir }}/"
-      when: arch == "s390x" and ccache_check.stat.exists
+      when: use_ccache and arch == "s390x" and ccache_check.stat.exists
 
     - name: Inject docker cache with ccache
       ansible.builtin.shell:
         cmd: ansible/scripts/inject_docker_cache.sh "{{ collector_root }}/{{ ccache_dir }}" "{{ container_ccache_dir }}"
         chdir: "{{ collector_root }}"
-      when: arch == "s390x" and ccache_check.stat.exists
+      when: use_ccache and arch == "s390x" and ccache_check.stat.exists
 
     - name: Build the collector builder image
       community.general.make:
         chdir: "{{ ansible_env.GITHUB_WORKSPACE | default(collector_root) }}"
         target: builder
-        params:
-          USE_CCACHE: "true"
 
     - name: Extract ccache from docker cache
       ansible.builtin.shell:
         cmd: ansible/scripts/extract_docker_cache.sh "{{ collector_root }}/{{ ccache_dir }}" "{{ container_ccache_dir }}"
         chdir: "{{ collector_root }}"
-      when: arch == "s390x"
+      when: use_ccache and arch == "s390x"
 
     - name: Fetch ccache
       ansible.builtin.fetch:
         src: "{{ collector_root }}/{{ ccache_path }}"
         dest: "{{ github_workspace }}/{{ ccache_dir }}/"
         flat: yes
-      when: arch == "s390x"
-
-    - name: Fetch build log
-      ansible.builtin.fetch:
-        src: "{{ collector_root }}/build_builder_image.log"
-        dest: "{{ github_workspace }}/"
-        flat: yes
-      when: arch == "s390x"
+      when: use_ccache and arch == "s390x"
 
     - name: Retag collector builder image to arch specific
       community.docker.docker_image:

ansible/ci-build-collector.yml

@@ -8,6 +8,8 @@
     COLLECTOR_TAG: "{{ collector_tag }}"
     DISABLE_PROFILING: "{{ disable_profiling }}"
     CMAKE_BUILD_TYPE: "{{ 'Debug' if debug_mode else 'Release' }}"
+    USE_CCACHE: "{{ use_ccache }}"
+    CCACHE_DIR: "{{ ansible_env.GITHUB_WORKSPACE | default(collector_root) }}/.ccache"
 
   vars:
     collector_root: "{{ ansible_env.HOME }}/collector"
@@ -42,26 +44,26 @@
       ansible.builtin.stat:
         path: "{{ github_workspace }}/{{ ccache_dir }}/{{ ccache_archive }}"
       register: ccache_check
-      when: arch == "s390x"
+      when: use_ccache and arch == "s390x"
 
     - name: Create cccache directory
       ansible.builtin.file:
         path: "{{ collector_root }}/{{ ccache_dir }}"
         state: directory
-      when: arch == "s390x" and ccache_check.stat.exists
+      when: use_ccache and arch == "s390x" and ccache_check.stat.exists
 
     - name: Copy ccache
       ansible.builtin.copy:
         src: "{{ github_workspace }}/{{ ccache_dir }}/{{ ccache_archive }}"
         dest: "{{ collector_root }}/"
-      when: arch == "s390x" and ccache_check.stat.exists
+      when: use_ccache and arch == "s390x" and ccache_check.stat.exists
 
     - name: Unarchive ccache
       ansible.builtin.unarchive:
         src: "{{ collector_root }}/{{ ccache_archive }}"
         dest: "{{ collector_root }}/{{ ccache_dir }}"
         remote_src: true
-      when: arch == "s390x" and ccache_check.stat.exists
+      when: use_ccache and arch == "s390x" and ccache_check.stat.exists
 
     - name: Run the builder image
       community.general.make:
@@ -72,9 +74,6 @@
       community.general.make:
         chdir: "{{ ansible_env.GITHUB_WORKSPACE | default(collector_root) }}"
         target: image
-        params:
-          CCACHE_DIR: "{{ ansible_env.GITHUB_WORKSPACE | default(collector_root) }}/.ccache"
-          USE_CCACHE: true
       register: build_result
       # ensure this action is printed
       tags: [print_action]
@@ -84,14 +83,14 @@
         rm -f "{{ collector_root }}/{{ ccache_archive }}"
         cd "{{ collector_root }}/{{ ccache_dir }}"
         tar czf "{{ collector_root }}/{{ ccache_archive }}" .
-      when: arch == "s390x"
+      when: use_ccache and arch == "s390x"
 
     - name: Fetch ccache
       ansible.builtin.fetch:
         src: "{{ collector_root }}/{{ ccache_archive }}"
         dest: "{{ github_workspace }}/{{ ccache_dir }}/"
         flat: yes
-      when: arch == "s390x"
+      when: use_ccache and arch == "s390x"
 
     - name: Retag collector image to arch specific
       community.docker.docker_image:

builder/Dockerfile

@@ -1,13 +1,11 @@
 FROM quay.io/centos/centos:stream9
 
 ARG BUILD_DIR=/install-tmp
-ARG USE_CCACHE=true
+ARG USE_CCACHE=false
 ENV USE_CCACHE=${USE_CCACHE}
 
 USER root
 
-RUN echo $USE_CCACHE
-
 RUN dnf -y update \
     && dnf -y install --nobest \
         autoconf \

builder/install/ccache.sh

@@ -10,14 +10,12 @@ if [ "$USE_CCACHE" = "true" ]; then
 
     cd third_party/ccache
     git fetch --tags
-    git checkout "$(git describe --tags "$(git rev-list --tags --max-count=1)")"
+    git checkout "${CCACHE_VERSION}"
 
     mkdir cmake-build && cd cmake-build
     cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=OFF -DENABLE_DOCUMENTATION=OFF -DREDIS_STORAGE_BACKEND=OFF ..
 
     make -j "${NPROCS}"
     make install
-
     ccache --version
-    ccache -s
 fi

builder/install/install-dependencies.sh

@@ -24,13 +24,6 @@ if [ "${USE_CCACHE}" = "true" ]; then
 
     # print stats and zero them
     ccache -z -d /root/.ccache
-
-    #export CCACHE_NOINODECACHE=true
-    #export CCACHE_SLOPPINESS=time_macros,file_macro,include_file_mtime,include_file_ctime,gcno_cwd
-    #export CCACHE_DEBUG=1
-    #export CCACHE_DEBUGDIR=/ccache-debug
-    #export CCACHE_LOGFILE=/ccache.log
-    #mkdir "${CCACHE_DEBUGDIR}" || true
 fi
 
 # shellcheck source=SCRIPTDIR/versions.sh
@@ -42,6 +35,5 @@ for f in builder/install/[0-9][0-9]-*.sh; do
 done
 
 if [ "${USE_CCACHE}" = "true" ]; then
-    echo "=== ccache stats after build ==="
     ccache -s -d /root/.ccache
 fi

builder/install/versions.sh

@@ -2,6 +2,7 @@
 
 export B64_VERSION=1.2.1
 export CARES_VERSION=1.16.0
+export CCACHE_VERSION=v4.10.2
 export CMAKE_VERSION=3.15.2
 export GOOGLETEST_REVISION=release-1.10.0
 export GRPC_REVISION=v1.28.1