From 7fcae8d847648ffe640efb4fe21ceeb8e12c3fa2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Jun 2025 10:19:12 -0400 Subject: [PATCH] Cirrus: remove config This commit removes the cirrus config file, thus all cirrus jobs. It also hardcodes the Makefile var SKOPEO_CIDEV_CONTAINER_FQIN to get rid of the cirrus.yml requirement. TODO: 1. It would be nice to have targets in the main Makefile independent of any CI system. 2. Fix test-integration-local target to handle the `registry-v2` binary issue. Currently, it's not buildable and Makefile doesn't account for it either. Signed-off-by: Lokesh Mandvekar --- .cirrus.yml | 259 ---------------------------------------------------- Makefile | 4 +- 2 files changed, 3 insertions(+), 260 deletions(-) delete mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index f38115ca..00000000 --- a/.cirrus.yml +++ /dev/null @@ -1,259 +0,0 @@ ---- - -# Main collection of env. vars to set for all tasks and scripts. -env: - #### - #### Global variables used for all tasks - #### - # Name of the ultimate destination branch for this CI run, PR or post-merge. - DEST_BRANCH: "main" - # Overrides default location (/tmp/cirrus) for repo clone - GOPATH: &gopath "/var/tmp/go" - GOBIN: "${GOPATH}/bin" - GOCACHE: "${GOPATH}/cache" - GOSRC: &gosrc "/var/tmp/go/src/github.com/containers/skopeo" - # Required for consistency with containers/image CI - SKOPEO_PATH: *gosrc - CIRRUS_WORKING_DIR: *gosrc - # The default is 'sh' if unspecified - CIRRUS_SHELL: "/bin/bash" - # Save a little typing (path relative to $CIRRUS_WORKING_DIR) - SCRIPT_BASE: "./contrib/cirrus" - - # Google-cloud VM Images - IMAGE_SUFFIX: "c20250131t121915z-f41f40d13" - FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" - - # Container FQIN's - FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" - - # Built along with the standard PR-based workflow in c/automation_images - SKOPEO_CIDEV_CONTAINER_FQIN: "quay.io/libpod/skopeo_cidev:${IMAGE_SUFFIX}" - - -# Default timeout for each task -timeout_in: 45m - - -gcp_credentials: ENCRYPTED[52d9e807b531b37ab14e958cb5a72499460663f04c8d73e22ad608c027a31118420f1c80f0be0882fbdf96f49d8f9ac0] - - -validate_task: - # The git-validation tool doesn't work well on branch or tag push, - # under Cirrus-CI, due to challenges obtaining the starting commit ID. - # Only do validation for PRs. - only_if: &is_pr $CIRRUS_PR != '' - container: - image: '${SKOPEO_CIDEV_CONTAINER_FQIN}' - cpu: 4 - memory: 8 - setup_script: | - make tools - test_script: | - make validate-local - make vendor && hack/tree_status.sh - -doccheck_task: - only_if: *is_pr - depends_on: - - validate - container: - image: "${FEDORA_CONTAINER_FQIN}" - cpu: 4 - memory: 8 - env: - BUILDTAGS: &withopengpg 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp' - script: | - # TODO: Can't use 'runner.sh setup' inside container. However, - # removing the pre-installed package is the only necessary step - # at the time of this comment. - dnf remove -y skopeo # Guarantee non-interference - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck - -osx_task: - # Don't run for docs-only builds. - # Also don't run on release-branches or their PRs, - # since base container-image is not version-constrained. - only_if: ¬_docs_or_release_branch >- - ($CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH || - $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH ) && - $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' - depends_on: - - validate - persistent_worker: &mac_pw - labels: - os: darwin - arch: arm64 - purpose: prod - env: - CIRRUS_WORKING_DIR: "$HOME/ci/task-${CIRRUS_TASK_ID}" - # Prevent cache-pollution fron one task to the next. - GOPATH: "$CIRRUS_WORKING_DIR/.go" - GOCACHE: "$CIRRUS_WORKING_DIR/.go/cache" - GOENV: "$CIRRUS_WORKING_DIR/.go/support" - GOSRC: "$HOME/ci/task-${CIRRUS_TASK_ID}" - TMPDIR: "/private/tmp/ci" - # This host is/was shared with potentially many other CI tasks. - # The previous task may have been canceled or aborted. - prep_script: &mac_cleanup "contrib/cirrus/mac_cleanup.sh" - test_script: - - export PATH=$GOPATH/bin:$PATH - - go version - - go env - - make tools - - make validate-local test-unit-local bin/skopeo - - bin/skopeo -v - # This host is/was shared with potentially many other CI tasks. - # Ensure nothing is left running while waiting for the next task. - always: - task_cleanup_script: *mac_cleanup - - -cross_task: - alias: cross - only_if: >- - $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' - depends_on: - - validate - gce_instance: &standardvm - image_project: libpod-218412 - zone: "us-central1-f" - cpu: 2 - memory: "4Gb" - # Required to be 200gig, do not modify - has i/o performance impact - # according to gcloud CLI tool warning messages. - disk: 200 - image_name: ${FEDORA_CACHE_IMAGE_NAME} - env: - BUILDTAGS: *withopengpg - setup_script: >- - "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup - cross_script: >- - "${GOSRC}/${SCRIPT_BASE}/runner.sh" cross - - -ostree-rs-ext_task: - alias: proxy_ostree_ext - only_if: *not_docs_or_release_branch - # WARNING: This task potentially performs a container image - # build (on change) with runtime package installs. Therefore, - # its behavior can be unpredictable and potentially flake-prone. - # In case of emergency, uncomment the next statement to bypass. - # - # skip: $CI == "true" - # - depends_on: - - validate - # Ref: https://cirrus-ci.org/guide/docker-builder-vm/#dockerfile-as-a-ci-environment - container: - # The runtime image will be rebuilt on change - dockerfile: contrib/cirrus/ostree_ext.dockerfile - docker_arguments: # required build-args - BASE_FQIN: quay.io/coreos-assembler/fcos-buildroot:testing-devel - CIRRUS_IMAGE_VERSION: 3 - env: - EXT_REPO_NAME: ostree-rs-ext - EXT_REPO_HOME: $CIRRUS_WORKING_DIR/../$EXT_REPO_NAME - EXT_REPO: https://github.com/ostreedev/${EXT_REPO_NAME}.git - skopeo_build_script: - - dnf builddep -y skopeo - - make - - make install - proxy_ostree_ext_build_script: - - git clone --depth 1 $EXT_REPO $EXT_REPO_HOME - - cd $EXT_REPO_HOME - - cargo test --no-run - proxy_ostree_ext_test_script: - - cd $EXT_REPO_HOME - - cargo test -- --nocapture --quiet - - -##### -##### NOTE: This task is subtantially duplicated in the containers/image -##### repository's `.cirrus.yml`. Changes made here should be fully merged -##### prior to being manually duplicated and maintained in containers/image. -##### -test_skopeo_task: - alias: test_skopeo - # Don't test for [CI:DOCS], [CI:BUILD]. - only_if: >- - $CIRRUS_CHANGE_TITLE !=~ '.*CI:BUILD.*' && - $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' - depends_on: - - validate - gce_instance: - image_project: libpod-218412 - zone: "us-central1-f" - cpu: 2 - memory: "4Gb" - # Required to be 200gig, do not modify - has i/o performance impact - # according to gcloud CLI tool warning messages. - disk: 200 - image_name: ${FEDORA_CACHE_IMAGE_NAME} - matrix: - - name: "Skopeo Test" # N/B: Name ref. by hack/get_fqin.sh - env: - BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove' - - name: "Skopeo Test w/ opengpg" - env: - BUILDTAGS: *withopengpg - setup_script: >- - "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup - vendor_script: >- - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" vendor - build_script: >- - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build - unit_script: >- - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" unit - integration_script: >- - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" integration - system_script: > - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" system - - -# This task is critical. It updates the "last-used by" timestamp stored -# in metadata for all VM images. This mechanism functions in tandem with -# an out-of-band pruning operation to remove disused VM images. -meta_task: - name: "VM img. keepalive" - alias: meta - container: &smallcontainer - cpu: 2 - memory: 2 - image: quay.io/libpod/imgts:latest - env: - # Space-separated list of images used by this repository state - IMGNAMES: | - ${FEDORA_CACHE_IMAGE_NAME} - build-push-${IMAGE_SUFFIX} - BUILDID: "${CIRRUS_BUILD_ID}" - REPOREF: "${CIRRUS_REPO_NAME}" - GCPJSON: ENCRYPTED[6867b5a83e960e7c159a98fe6c8360064567a071c6f4b5e7d532283ecd870aa65c94ccd74bdaa9bf7aadac9d42e20a67] - GCPNAME: ENCRYPTED[1cf558ae125e3c39ec401e443ad76452b25d790c45eb73d77c83eb059a0f7fd5085ef7e2f7e410b04ea6e83b0aab2eb1] - GCPPROJECT: libpod-218412 - clone_script: &noop mkdir -p "$CIRRUS_WORKING_DIR" - script: /usr/local/bin/entrypoint.sh - - -# Status aggregator for all tests. This task simply ensures a defined -# set of tasks all passed, and allows confirming that based on the status -# of this task. -success_task: - name: "Total Success" - alias: success - # N/B: ALL tasks must be listed here, minus their '_task' suffix. - depends_on: - - validate - - doccheck - - osx - - cross - - proxy_ostree_ext - - test_skopeo - - meta - container: *smallcontainer - env: - CTR_FQIN: ${FEDORA_CONTAINER_FQIN} - TEST_ENVIRON: container - clone_script: *noop - script: /bin/true diff --git a/Makefile b/Makefile index 6ac85261..8b735350 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,9 @@ export SKOPEO_CONTAINER_TESTS ?= $(if $(CI),1,0) # This is a compromise, we either use a container for this or require # the local user to have a compatible python3 development environment. # Define it as a "resolve on use" variable to avoid calling out when possible -SKOPEO_CIDEV_CONTAINER_FQIN ?= $(shell hack/get_fqin.sh) +#SKOPEO_CIDEV_CONTAINER_FQIN ?= $(shell hack/get_fqin.sh) +# FIXME: hack/get_fqin.sh depends on cirrus.yml so we hardcode SKOPEO_CIDEV_CONTAINER_FQIN here +SKOPEO_CIDEV_CONTAINER_FQIN ?= "quay.io/libpod/skopeo_cidev:c20250131t121915z-f41f40d13" CONTAINER_CMD ?= ${CONTAINER_RUNTIME} run --rm -i -e TESTFLAGS="$(TESTFLAGS)" -e CI=$(CI) -e SKOPEO_CONTAINER_TESTS=1 # if this session isn't interactive, then we don't want to allocate a # TTY, which would fail, but if it is interactive, we do want to attach