From 3887fc2f161a16d2cb18b7327c6f4d0d5be532f7 Mon Sep 17 00:00:00 2001 From: Haochen Hu Date: Mon, 13 Dec 2021 21:08:17 -0500 Subject: [PATCH 1/2] change config/blobs.yml to test local shield release --- config/blobs.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/blobs.yml b/config/blobs.yml index e361afb..2562c40 100644 --- a/config/blobs.yml +++ b/config/blobs.yml @@ -7,9 +7,8 @@ nginx/pcre-8.37.tar.gz: object_id: ceabbcdf-1322-4430-8684-b604a962e3de sha: 4a24a20c61347d8da4edc86d5475aaf70ac146bb shield/shield-server-linux-amd64-8.7.4.tar.gz: - size: 110623911 - object_id: b986042c-19a9-4b42-7003-afe65307340f - sha: sha256:47e74a03f027d96391495161d19b6b0591bf464b98824fd7dc07735b3b582921 + size: 112021165 + sha: sha256:ecb4083fede19fc25e9faf22eaf17bded5d197c6bd64e7a874ee5977d023d8d1 sqlite3/sqlite-autoconf-3240000.tar.gz: size: 2699252 object_id: 79f6c9d4-f6a6-4487-752e-82586780b77b From 71263ce0c1993e49b83c90eabfe67a74a62daa8f Mon Sep 17 00:00:00 2001 From: Haochen Hu Date: Fri, 24 Jun 2022 14:56:09 -0400 Subject: [PATCH 2/2] upload new shield blob --- ci/pipeline.yml | 171 ++++++++++++++++++++------------------------ ci/release_notes.md | 1 + 2 files changed, 79 insertions(+), 93 deletions(-) create mode 100644 ci/release_notes.md diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 98a5fdc..aaf7fe8 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -79,38 +79,32 @@ jobs: public: true serial: true plan: - - name: main - do: - - name: get - in_parallel: - - { get: git, trigger: true } - - name: testflights - in_parallel: - - name: testflight - task: testflight - config: - platform: linux - image_resource: - type: docker-image - source: - repository: (( grab meta.image.name )) - tag: (( grab meta.image.tag )) - inputs: - - { name: git } - run: - path: ./git/ci/scripts/testflight - args: [] - params: - REPO_ROOT: git - BOSH_ENVIRONMENT: (( grab meta.bosh-lite.target )) - BOSH_CA_CERT: (( grab meta.bosh-lite.cacert )) - BOSH_CLIENT: (( grab meta.bosh-lite.username )) - BOSH_CLIENT_SECRET: (( grab meta.bosh-lite.password )) - BOSH_DEPLOYMENT: (( grab meta.bosh-lite.deployment )) - TEST_ERRANDS: (( grab meta.test-errands || meta.test-errand || ~ )) - AWS_ACCESS_KEY: (( grab meta.aws.access_key )) - AWS_SECRET_KEY: (( grab meta.aws.secret_key )) - MANIFEST_PATH: (( grab meta.manifest.path )) + - in_parallel: + - { get: git, trigger: true } + - task: testflight + config: + platform: linux + image_resource: + type: docker-image + source: + repository: (( grab meta.image.name )) + tag: (( grab meta.image.tag )) + inputs: + - { name: git } + run: + path: ./git/ci/scripts/testflight + args: [] + params: + REPO_ROOT: git + BOSH_ENVIRONMENT: (( grab meta.bosh-lite.target )) + BOSH_CA_CERT: (( grab meta.bosh-lite.cacert )) + BOSH_CLIENT: (( grab meta.bosh-lite.username )) + BOSH_CLIENT_SECRET: (( grab meta.bosh-lite.password )) + BOSH_DEPLOYMENT: (( grab meta.bosh-lite.deployment )) + TEST_ERRAND: (( grab meta.test-errands || meta.test-errand || ~ )) + AWS_ACCESS_KEY: (( grab meta.aws.access_key )) + AWS_SECRET_KEY: (( grab meta.aws.secret_key )) + MANIFEST_PATH: (( grab meta.manifest.path )) on_success: put: notify params: @@ -249,69 +243,60 @@ jobs: public: true serial: true plan: - - do: - - name: inputs - in_parallel: - - { get: version, passed: [rc], params: {bump: final} } - - { get: git, passed: [rc] } - - name: release - task: release - config: - platform: linux - image_resource: - type: docker-image - source: - repository: (( grab meta.image.name )) - tag: (( grab meta.image.tag )) - inputs: - - name: version - - name: git - outputs: - - name: gh - - name: pushme - - name: notifications - run: - path: ./git/ci/scripts/shipit - args: [] - params: - REPO_ROOT: git - VERSION_FROM: version/number - RELEASE_ROOT: gh - REPO_OUT: pushme - BRANCH: (( grab meta.github.branch )) - GITHUB_OWNER: (( grab meta.github.owner )) - GIT_EMAIL: (( grab meta.git.email )) - GIT_NAME: (( grab meta.git.name )) - AWS_ACCESS_KEY: (( grab meta.aws.access_key )) - AWS_SECRET_KEY: (( grab meta.aws.secret_key )) - - - name: upload-git - put: git - params: - rebase: true - repository: pushme/git - - name: tarball - put: s3-tarball - params: - file: (( concat "gh/artifacts/" meta.name "-*.tgz" )) - - name: github-release - put: github + - in_parallel: + - { get: version, passed: [rc], params: {bump: final} } + - { get: git, passed: [rc] } + - task: release + config: + platform: linux + image_resource: + type: docker-image + source: + repository: (( grab meta.image.name )) + tag: (( grab meta.image.tag )) + inputs: + - name: version + - name: git + outputs: + - name: gh + - name: pushme + - name: notifications + run: + path: ./git/ci/scripts/shipit + args: [] params: - name: gh/name - tag: gh/tag - body: gh/notes.md - globs: [gh/artifacts/*] - - name: version-bump - put: version + REPO_ROOT: git + VERSION_FROM: version/number + RELEASE_ROOT: gh + REPO_OUT: pushme + BRANCH: (( grab meta.github.branch )) + GITHUB_OWNER: (( grab meta.github.owner )) + GIT_EMAIL: (( grab meta.git.email )) + GIT_NAME: (( grab meta.git.name )) + AWS_ACCESS_KEY: (( grab meta.aws.access_key )) + AWS_SECRET_KEY: (( grab meta.aws.secret_key )) + - put: git + params: + rebase: true + repository: pushme/git + - put: s3-tarball + params: + file: (( concat "gh/artifacts/" meta.name "-*.tgz" )) + - put: github + params: + name: gh/name + tag: gh/tag + body: gh/notes.md + globs: [gh/artifacts/*] + - put: version + params: + bump: patch + - in_parallel: + - put: notify params: - bump: patch - - name: notify - in_parallel: - - put: notify - params: - method: announce - file: notifications/message - link: (( concat meta.github.uri "/releases" )) + method: announce + file: notifications/message + link: (( concat meta.github.uri "/releases" )) on_success: put: notify diff --git a/ci/release_notes.md b/ci/release_notes.md new file mode 100644 index 0000000..c4e7c2a --- /dev/null +++ b/ci/release_notes.md @@ -0,0 +1 @@ +upload new shield blob