Skip to content

Commit

Permalink
[CI:DOCS] Cirrus: Use the latest imgts container
Browse files Browse the repository at this point in the history
Contains important updates re: preserving release-branch CI VM images.
Ref: containers/automation_images#157

Signed-off-by: Chris Evich <[email protected]>
  • Loading branch information
cevich authored and lsm5 committed Jan 5, 2023
1 parent 59c6b4d commit feae675
Showing 1 changed file with 23 additions and 22 deletions.
45 changes: 23 additions & 22 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,30 +83,31 @@ doccheck_task:
"${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build
"${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck
osx_task:
only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
depends_on:
- validate
macos_instance:
image: catalina-xcode
setup_script: |
# /usr/local/opt/[email protected] will be populated by (brew install [email protected]) below
export PATH=$GOPATH/bin:/usr/local/opt/[email protected]/bin:$PATH
brew update
brew install gpgme [email protected] go-md2man
go get -u golang.org/x/lint/golint
test_script: |
export PATH=$GOPATH/bin:/usr/local/opt/[email protected]/bin:$PATH
go version
go env
make validate-local test-unit-local bin/skopeo
sudo make install
/usr/local/bin/skopeo -v
#osx_task:
# only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
# depends_on:
# - validate
# macos_instance:
# image: catalina-xcode
# setup_script: |
# # /usr/local/opt/[email protected] will be populated by (brew install [email protected]) below
# export PATH=$GOPATH/bin:/usr/local/opt/[email protected]/bin:$PATH
# brew update
# brew install gpgme [email protected] go-md2man
# go get -u golang.org/x/lint/golint
# test_script: |
# export PATH=$GOPATH/bin:/usr/local/opt/[email protected]/bin:$PATH
# go version
# go env
# make validate-local test-unit-local bin/skopeo
# sudo make install
# /usr/local/bin/skopeo -v


cross_task:
alias: cross
only_if: *not_docs
only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
# only_if: *not_docs
depends_on:
- validate
gce_instance:
Expand Down Expand Up @@ -175,7 +176,7 @@ meta_task:
container: &smallcontainer
cpu: 2
memory: 2
image: quay.io/libpod/imgts:$IMAGE_SUFFIX
image: quay.io/libpod/imgts:latest
env:
# Space-separated list of images used by this repository state
IMGNAMES: >-
Expand All @@ -202,7 +203,7 @@ success_task:
depends_on:
- validate
- doccheck
- osx
#- osx
- cross
- test_skopeo
- meta
Expand Down

0 comments on commit feae675

Please sign in to comment.