diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-22 00:29:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-22 00:29:52 +0100 |
commit | aa13779e9e8d5bb6090d514e3aad9387cb0a2d35 (patch) | |
tree | 062e1f1f8499375c5124487769e13b7b5fb788f1 /.cirrus.yml | |
parent | f63005e0f23ae6a71c2c910014c5e19623272f73 (diff) | |
parent | d4c2aaf38ad066e742dad530535faade39dadd1a (diff) | |
download | podman-aa13779e9e8d5bb6090d514e3aad9387cb0a2d35.tar.gz podman-aa13779e9e8d5bb6090d514e3aad9387cb0a2d35.tar.bz2 podman-aa13779e9e8d5bb6090d514e3aad9387cb0a2d35.zip |
Merge pull request #4899 from baude/apiv2service
Apiv2service
Diffstat (limited to '.cirrus.yml')
-rw-r--r-- | .cirrus.yml | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 341b7549e..e1810fab6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -640,29 +640,29 @@ verify_test_built_images_task: always: <<: *standardlogs -upload_snap_task: - only_if: >- - $CIRRUS_BRANCH != $DEST_BRANCH && - $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && - $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' - - # Only when PR or branch is merged into master - - depends_on: - - "test_building_snap" - - container: - image: yakshaveinc/snapcraft:core18 - - env: - SNAPCRAFT_LOGIN: ENCRYPTED[d8e82eb31c6372fec07f405f413d57806026b1a9f8400033531ebcd54d6750a5e4a8b1f68e3ec65c98c65e0d9b2a6a75] - snapcraft_login_file: - path: /root/.snapcraft/login.cfg - variable_name: SNAPCRAFT_LOGIN - snapcraft_script: - - 'apt-get -y update' - - 'snapcraft login --with "/root/.snapcraft/login.cfg"' - - 'cd contrib/snapcraft && snapcraft && snapcraft push *.snap --release edge' + #upload_snap_task: + # only_if: >- + # $CIRRUS_BRANCH != $DEST_BRANCH && + # $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && + # $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' + # + # # Only when PR or branch is merged into master + # + # depends_on: + # - "test_building_snap" + # + # container: + # image: yakshaveinc/snapcraft:core18 + # + # env: + # SNAPCRAFT_LOGIN: ENCRYPTED[d8e82eb31c6372fec07f405f413d57806026b1a9f8400033531ebcd54d6750a5e4a8b1f68e3ec65c98c65e0d9b2a6a75] + # snapcraft_login_file: + # path: /root/.snapcraft/login.cfg + # variable_name: SNAPCRAFT_LOGIN + # snapcraft_script: + # - 'apt-get -y update' + # - 'snapcraft login --with "/root/.snapcraft/login.cfg"' + # - 'cd contrib/snapcraft && snapcraft && snapcraft push *.snap --release edge' docs_task: @@ -705,7 +705,6 @@ success_task: - "special_testing_endpoint" - "test_build_cache_images" - "test_building_snap" - - "upload_snap" - "verify_test_built_images" - "docs" |