release: Add script to tag repos #16

jcvenegas · 2018-04-18T20:02:39Z

Add helper script to tag repos.

Check all repos are in the same version
Create annotated tags
Push tags to the repos

Signed-off-by: Jose Carlos Venegas Munoz jose.carlos.venegas.munoz@intel.com

jcvenegas · 2018-04-18T20:04:20Z

Adding tag for test repo as well ( suggested by @chavafg)

chavafg · 2018-04-18T20:10:51Z

release/tag_repos.sh

+PUSH="${PUSH:-"false"}"
+commit="master"
+readonly URL_RAW_FILE="https://raw.githubusercontent.com/${OWNER}"
+#The runtime version is used as deference of latest release


s/deference/reference?

jcvenegas · 2018-04-18T20:27:25Z

@chavafg changes applied.

@bergwolf @laijs @egernst current 0.0.1 tags created and pushed with this script.

chavafg · 2018-04-18T21:16:45Z

lgtm

jodh-intel

Just a few nits.

@klynnrif - ptal.

jodh-intel · 2018-04-19T06:51:22Z

release/README.md

+
+The `tag_repos.sh` script is used to create tags for the Kata Containers
+repositories. This script make sure that all the repositories are in the
+same version (by checking the VERSION file).


You could add backticks for VERSION maybe.

jodh-intel · 2018-04-19T06:51:42Z

release/README.md

+- proxy.
+- runtime.
+- shim.
+- throttle.


"throttler".

jodh-intel · 2018-04-19T06:55:56Z

release/README.md

+- shim.
+- throttle.
+
+Additionally, the script will tag tests and osbuilder repositories to know


I'd reword slightly to something like:

The script will also tag the tests and osbuilder repositories to make it clear which versions of these supporting repositories were used for the release.

jodh-intel · 2018-04-19T06:56:37Z

release/tag_repos.sh

+
+	cat <<EOT
+Usage: ${script_name} [options] <args>
+This script creates a new release for ${PROJECT}


Missing period at the end of the sentence?

jcvenegas · 2018-04-19T15:36:02Z

@jodh-intel changes applied.

klynnrif

A couple changes for grammar, structure, and flow. Thanks!

klynnrif · 2018-04-19T15:44:53Z

release/README.md

+## tag_repos.sh ##
+
+The `tag_repos.sh` script is used to create tags for the Kata Containers
+repositories. This script make sure that all the repositories are in the


Suggested rewrite: This scripts ensures that all the repositories are in the

klynnrif · 2018-04-19T15:45:40Z

release/README.md

+repositories. This script make sure that all the repositories are in the
+same version (by checking the `VERSION` file).
+
+It will create an **annotated tag** for the new release version for the


Suggested rewrite: The script creates an annotated tag for the new release version for the

klynnrif · 2018-04-19T15:46:26Z

release/README.md

+It will create an **annotated tag** for the new release version for the
+following repositories:
+
+- agent.


Since the items in this list are not complete sentences I suggest removing the period after each item in lines 14-18.

klynnrif · 2018-04-19T15:48:12Z

release/README.md

+- shim.
+- throttler.
+
+The script will also tag the tests and osbuilder repositories to make it


Lines 20-22 suggested rewrite to keep active: The script also tags the tests and osbuilder repositories to make it clear which versions of these supporting repositories are used for the release.

jodh-intel · 2018-04-19T16:41:58Z

Thanks @jcvenegas - once @klynnrif's comments are resolved,

lgtm.

Add helper script to tag repos. - Check all repos are in the same version - Create annotated tags - Push tags to the repos Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>

jcvenegas · 2018-04-19T19:45:36Z

@klynnrif ping , changes applied.

jcvenegas · 2018-04-20T21:15:11Z

@klynnrif ready to merge, could you ack is good ?

klynnrif

lgtm - thanks!

@Pennyzct

Reverts #269 The added kernel patch doesn't apply and is causing all CI to fail. FYI, the current guest kernel version is 4.14.67. Please rebase and re-submit your PR cleanly @Pennyzct. e.g., http://jenkins.katacontainers.io/job/kata-containers-runtime-centos-7-4-PR/995/console NFO: Applying patch /tmp/jenkins/workspace/kata-containers-runtime-centos-7-4-PR/go/src/github.com/kata-containers/packaging/kernel/patches/0003-backport-Arm64-KVM-Dynamic-IPA-and-52bit-IPA-support.patch patching file arch/arm/include/asm/kvm_arm.h patching file arch/arm/include/asm/kvm_host.h Hunk #1 succeeded at 266 (offset -7 lines). Hunk #2 succeeded at 314 with fuzz 2 (offset -40 lines). patching file arch/arm/include/asm/kvm_mmu.h Hunk #1 FAILED at 35. Hunk #2 succeeded at 47 with fuzz 2 (offset -5 lines). Hunk #3 succeeded at 266 with fuzz 2 (offset -96 lines). 1 out of 3 hunks FAILED -- saving rejects to file arch/arm/include/asm/kvm_mmu.h.rej patching file arch/arm/include/asm/stage2_pgtable.h patching file arch/arm64/include/asm/cpufeature.h Hunk #1 FAILED at 262. Hunk #2 succeeded at 284 (offset -246 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/cpufeature.h.rej patching file arch/arm64/include/asm/kvm_arm.h Hunk #1 succeeded at 102 (offset -5 lines). Hunk #2 succeeded at 116 (offset -5 lines). Hunk #3 succeeded at 305 (offset -7 lines). patching file arch/arm64/include/asm/kvm_asm.h Hunk #1 succeeded at 27 (offset -3 lines). Hunk #2 FAILED at 73. 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_asm.h.rej patching file arch/arm64/include/asm/kvm_host.h Hunk #1 succeeded at 48 (offset -5 lines). Hunk #2 FAILED at 61. Hunk #3 succeeded at 399 with fuzz 2 (offset -41 lines). Hunk #4 FAILED at 503. 2 out of 4 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_host.h.rej patching file arch/arm64/include/asm/kvm_hyp.h patching file arch/arm64/include/asm/kvm_mmu.h Hunk #1 succeeded at 154 (offset 13 lines). Hunk #2 succeeded at 229 with fuzz 1 (offset -17 lines). Hunk #3 succeeded at 409 with fuzz 2 (offset -110 lines). patching file arch/arm64/include/asm/stage2_pgtable-nopmd.h patching file arch/arm64/include/asm/stage2_pgtable-nopud.h patching file arch/arm64/include/asm/stage2_pgtable.h patching file arch/arm64/kvm/guest.c Hunk #1 succeeded at 305 (offset -86 lines). patching file arch/arm64/kvm/hyp-init.S Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file arch/arm64/kvm/hyp-init.S.rej patching file arch/arm64/kvm/hyp/Makefile Hunk #1 succeeded at 18 (offset -1 lines). patching file arch/arm64/kvm/hyp/s2-setup.c Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file arch/arm64/kvm/hyp/s2-setup.c.rej patching file arch/arm64/kvm/hyp/switch.c Hunk #1 FAILED at 198. Hunk #2 succeeded at 226 (offset -37 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/kvm/hyp/switch.c.rej patching file arch/arm64/kvm/hyp/tlb.c Hunk #1 succeeded at 29 (offset -1 lines). Hunk #2 succeeded at 38 (offset -1 lines). patching file arch/arm64/kvm/reset.c Hunk #4 FAILED at 86. Hunk #5 succeeded at 133 (offset -4 lines). 1 out of 5 hunks FAILED -- saving rejects to file arch/arm64/kvm/reset.c.rej patching file include/linux/irqchip/arm-gic-v3.h Hunk #1 succeeded at 374 (offset -14 lines). patching file include/uapi/linux/kvm.h Hunk #1 succeeded at 739 (offset -11 lines). Hunk #2 FAILED at 962. 1 out of 2 hunks FAILED -- saving rejects to file include/uapi/linux/kvm.h.rej patching file virt/kvm/arm/arm.c Hunk #1 succeeded at 115 (offset -5 lines). Hunk #2 succeeded at 207 (offset -6 lines). Hunk #3 succeeded at 236 (offset -6 lines). Hunk #4 succeeded at 463 (offset -35 lines). Hunk #5 FAILED at 546. Hunk #6 succeeded at 1164 with fuzz 2 (offset -145 lines). Hunk #7 succeeded at 1261 (offset -147 lines). 1 out of 7 hunks FAILED -- saving rejects to file virt/kvm/arm/arm.c.rej patching file virt/kvm/arm/mmu.c Hunk #1 succeeded at 43 with fuzz 2 (offset -2 lines). Hunk #2 succeeded at 147 (offset -2 lines). Hunk #3 succeeded at 216 (offset -35 lines). Hunk #4 succeeded at 226 (offset -35 lines). Hunk #5 succeeded at 245 (offset -35 lines). Hunk #6 succeeded at 255 (offset -35 lines). Hunk #7 succeeded at 272 (offset -35 lines). Hunk #8 succeeded at 371 with fuzz 2 (offset 40 lines). Hunk #9 FAILED at 340. Hunk #10 FAILED at 370. Hunk #11 FAILED at 388. Hunk #12 FAILED at 408. Hunk #13 succeeded at 753 (offset -143 lines). Hunk #14 succeeded at 842 (offset -143 lines). Hunk #15 succeeded at 850 (offset -143 lines). Hunk #16 succeeded at 859 (offset -143 lines). Hunk #17 succeeded at 881 (offset -143 lines). Hunk #18 succeeded at 1024 (offset -182 lines). Hunk #19 succeeded at 1114 (offset -188 lines). Hunk #20 succeeded at 1148 (offset -188 lines). Hunk #21 succeeded at 1176 (offset -188 lines). Hunk #22 succeeded at 1190 (offset -188 lines). Hunk #23 succeeded at 1333 (offset -196 lines). Hunk #24 succeeded at 1552 (offset -220 lines). Hunk #25 succeeded at 1852 (offset -219 lines). 4 out of 25 hunks FAILED -- saving rejects to file virt/kvm/arm/mmu.c.rej patching file virt/kvm/arm/vgic/vgic-its.c Hunk #1 succeeded at 233 (offset -8 lines). Hunk #2 succeeded at 696 (offset -56 lines). Hunk #3 succeeded at 721 (offset -56 lines). Hunk #4 succeeded at 736 (offset -56 lines). Hunk #5 succeeded at 746 (offset -56 lines). Hunk #6 succeeded at 1214 (offset -80 lines). Hunk #7 succeeded at 1232 (offset -80 lines). Hunk #8 succeeded at 1279 (offset -80 lines). Hunk #9 succeeded at 2135 (offset -82 lines). Hunk #10 succeeded at 2207 (offset -82 lines). Hunk #11 succeeded at 2256 (offset -82 lines). patching file virt/kvm/arm/vgic/vgic-mmio-v3.c Hunk #1 succeeded at 326 (offset -38 lines). Hunk #2 succeeded at 343 (offset -38 lines). Build step 'Execute shell' marked build as failure Performing Post build task... Match found for :.* : True Logical operation result is TRUE Running script : #!/bin/bash Fixes: #296 Signed-off-by: Peng Tao <bergwolf@gmail.com>

@Pennyzct

Reverts #269 The added kernel patch doesn't apply and is causing all CI to fail. FYI, the current guest kernel version is 4.14.67. Please rebase and re-submit your PR cleanly @Pennyzct. e.g., http://jenkins.katacontainers.io/job/kata-containers-runtime-centos-7-4-PR/995/console NFO: Applying patch /tmp/jenkins/workspace/kata-containers-runtime-centos-7-4-PR/go/src/github.com/kata-containers/packaging/kernel/patches/0003-backport-Arm64-KVM-Dynamic-IPA-and-52bit-IPA-support.patch patching file arch/arm/include/asm/kvm_arm.h patching file arch/arm/include/asm/kvm_host.h Hunk #1 succeeded at 266 (offset -7 lines). Hunk #2 succeeded at 314 with fuzz 2 (offset -40 lines). patching file arch/arm/include/asm/kvm_mmu.h Hunk #1 FAILED at 35. Hunk #2 succeeded at 47 with fuzz 2 (offset -5 lines). Hunk #3 succeeded at 266 with fuzz 2 (offset -96 lines). 1 out of 3 hunks FAILED -- saving rejects to file arch/arm/include/asm/kvm_mmu.h.rej patching file arch/arm/include/asm/stage2_pgtable.h patching file arch/arm64/include/asm/cpufeature.h Hunk #1 FAILED at 262. Hunk #2 succeeded at 284 (offset -246 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/cpufeature.h.rej patching file arch/arm64/include/asm/kvm_arm.h Hunk #1 succeeded at 102 (offset -5 lines). Hunk #2 succeeded at 116 (offset -5 lines). Hunk #3 succeeded at 305 (offset -7 lines). patching file arch/arm64/include/asm/kvm_asm.h Hunk #1 succeeded at 27 (offset -3 lines). Hunk #2 FAILED at 73. 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_asm.h.rej patching file arch/arm64/include/asm/kvm_host.h Hunk #1 succeeded at 48 (offset -5 lines). Hunk #2 FAILED at 61. Hunk #3 succeeded at 399 with fuzz 2 (offset -41 lines). Hunk #4 FAILED at 503. 2 out of 4 hunks FAILED -- saving rejects to file arch/arm64/include/asm/kvm_host.h.rej patching file arch/arm64/include/asm/kvm_hyp.h patching file arch/arm64/include/asm/kvm_mmu.h Hunk #1 succeeded at 154 (offset 13 lines). Hunk #2 succeeded at 229 with fuzz 1 (offset -17 lines). Hunk #3 succeeded at 409 with fuzz 2 (offset -110 lines). patching file arch/arm64/include/asm/stage2_pgtable-nopmd.h patching file arch/arm64/include/asm/stage2_pgtable-nopud.h patching file arch/arm64/include/asm/stage2_pgtable.h patching file arch/arm64/kvm/guest.c Hunk #1 succeeded at 305 (offset -86 lines). patching file arch/arm64/kvm/hyp-init.S Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file arch/arm64/kvm/hyp-init.S.rej patching file arch/arm64/kvm/hyp/Makefile Hunk #1 succeeded at 18 (offset -1 lines). patching file arch/arm64/kvm/hyp/s2-setup.c Reversed (or previously applied) patch detected! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file arch/arm64/kvm/hyp/s2-setup.c.rej patching file arch/arm64/kvm/hyp/switch.c Hunk #1 FAILED at 198. Hunk #2 succeeded at 226 (offset -37 lines). 1 out of 2 hunks FAILED -- saving rejects to file arch/arm64/kvm/hyp/switch.c.rej patching file arch/arm64/kvm/hyp/tlb.c Hunk #1 succeeded at 29 (offset -1 lines). Hunk #2 succeeded at 38 (offset -1 lines). patching file arch/arm64/kvm/reset.c Hunk #4 FAILED at 86. Hunk #5 succeeded at 133 (offset -4 lines). 1 out of 5 hunks FAILED -- saving rejects to file arch/arm64/kvm/reset.c.rej patching file include/linux/irqchip/arm-gic-v3.h Hunk #1 succeeded at 374 (offset -14 lines). patching file include/uapi/linux/kvm.h Hunk #1 succeeded at 739 (offset -11 lines). Hunk #2 FAILED at 962. 1 out of 2 hunks FAILED -- saving rejects to file include/uapi/linux/kvm.h.rej patching file virt/kvm/arm/arm.c Hunk #1 succeeded at 115 (offset -5 lines). Hunk #2 succeeded at 207 (offset -6 lines). Hunk #3 succeeded at 236 (offset -6 lines). Hunk #4 succeeded at 463 (offset -35 lines). Hunk #5 FAILED at 546. Hunk #6 succeeded at 1164 with fuzz 2 (offset -145 lines). Hunk #7 succeeded at 1261 (offset -147 lines). 1 out of 7 hunks FAILED -- saving rejects to file virt/kvm/arm/arm.c.rej patching file virt/kvm/arm/mmu.c Hunk #1 succeeded at 43 with fuzz 2 (offset -2 lines). Hunk #2 succeeded at 147 (offset -2 lines). Hunk #3 succeeded at 216 (offset -35 lines). Hunk #4 succeeded at 226 (offset -35 lines). Hunk #5 succeeded at 245 (offset -35 lines). Hunk #6 succeeded at 255 (offset -35 lines). Hunk #7 succeeded at 272 (offset -35 lines). Hunk #8 succeeded at 371 with fuzz 2 (offset 40 lines). Hunk #9 FAILED at 340. Hunk #10 FAILED at 370. Hunk #11 FAILED at 388. Hunk #12 FAILED at 408. Hunk #13 succeeded at 753 (offset -143 lines). Hunk #14 succeeded at 842 (offset -143 lines). Hunk #15 succeeded at 850 (offset -143 lines). Hunk #16 succeeded at 859 (offset -143 lines). Hunk #17 succeeded at 881 (offset -143 lines). Hunk #18 succeeded at 1024 (offset -182 lines). Hunk #19 succeeded at 1114 (offset -188 lines). Hunk #20 succeeded at 1148 (offset -188 lines). Hunk #21 succeeded at 1176 (offset -188 lines). Hunk #22 succeeded at 1190 (offset -188 lines). Hunk #23 succeeded at 1333 (offset -196 lines). Hunk #24 succeeded at 1552 (offset -220 lines). Hunk #25 succeeded at 1852 (offset -219 lines). 4 out of 25 hunks FAILED -- saving rejects to file virt/kvm/arm/mmu.c.rej patching file virt/kvm/arm/vgic/vgic-its.c Hunk #1 succeeded at 233 (offset -8 lines). Hunk #2 succeeded at 696 (offset -56 lines). Hunk #3 succeeded at 721 (offset -56 lines). Hunk #4 succeeded at 736 (offset -56 lines). Hunk #5 succeeded at 746 (offset -56 lines). Hunk #6 succeeded at 1214 (offset -80 lines). Hunk #7 succeeded at 1232 (offset -80 lines). Hunk #8 succeeded at 1279 (offset -80 lines). Hunk #9 succeeded at 2135 (offset -82 lines). Hunk #10 succeeded at 2207 (offset -82 lines). Hunk #11 succeeded at 2256 (offset -82 lines). patching file virt/kvm/arm/vgic/vgic-mmio-v3.c Hunk #1 succeeded at 326 (offset -38 lines). Hunk #2 succeeded at 343 (offset -38 lines). Build step 'Execute shell' marked build as failure Performing Post build task... Match found for :.* : True Logical operation result is TRUE Running script : #!/bin/bash Fixes: #296 Signed-off-by: Peng Tao <bergwolf@gmail.com>

jcvenegas added the review label Apr 18, 2018

jcvenegas requested review from jodh-intel and chavafg April 18, 2018 20:02

chavafg reviewed Apr 18, 2018

View reviewed changes

jcvenegas force-pushed the tag_repos branch 2 times, most recently from 52ac90f to 271e811 Compare April 18, 2018 20:26

jcvenegas force-pushed the tag_repos branch from 271e811 to d997cf2 Compare April 18, 2018 21:01

jodh-intel reviewed Apr 19, 2018

View reviewed changes

jcvenegas force-pushed the tag_repos branch from d997cf2 to b7406ab Compare April 19, 2018 15:35

klynnrif suggested changes Apr 19, 2018

View reviewed changes

release: Add script to tag repos

23cf4f6

Add helper script to tag repos. - Check all repos are in the same version - Create annotated tags - Push tags to the repos Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>

jcvenegas force-pushed the tag_repos branch from b7406ab to 23cf4f6 Compare April 19, 2018 19:44

jcvenegas mentioned this pull request Apr 20, 2018

docs: Add Release process docs kata-containers/documentation#56

Merged

klynnrif approved these changes Apr 21, 2018

View reviewed changes

egernst approved these changes Apr 23, 2018

View reviewed changes

egernst merged commit d3e8d9c into kata-containers:master Apr 23, 2018

egernst removed the review label Apr 23, 2018

This was referenced Jan 3, 2019

Revert "kernel: update guest kernel to 4.19.8 on aarch64 " #295

Merged

kernel patch does not apply properly #296

Closed

jcvenegas deleted the tag_repos branch February 5, 2019 20:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

release: Add script to tag repos #16

release: Add script to tag repos #16

jcvenegas commented Apr 18, 2018

jcvenegas commented Apr 18, 2018

chavafg Apr 18, 2018

jcvenegas commented Apr 18, 2018

chavafg commented Apr 18, 2018

jodh-intel left a comment

jodh-intel Apr 19, 2018

jodh-intel Apr 19, 2018

jodh-intel Apr 19, 2018

jodh-intel Apr 19, 2018

jcvenegas commented Apr 19, 2018

klynnrif left a comment

klynnrif Apr 19, 2018

klynnrif Apr 19, 2018

klynnrif Apr 19, 2018

klynnrif Apr 19, 2018

jodh-intel commented Apr 19, 2018 •

edited by amshinde

Loading

jcvenegas commented Apr 19, 2018

jcvenegas commented Apr 20, 2018

klynnrif left a comment

release: Add script to tag repos #16

release: Add script to tag repos #16

Conversation

jcvenegas commented Apr 18, 2018

jcvenegas commented Apr 18, 2018

Choose a reason for hiding this comment

jcvenegas commented Apr 18, 2018

chavafg commented Apr 18, 2018

jodh-intel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jcvenegas commented Apr 19, 2018

klynnrif left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jodh-intel commented Apr 19, 2018 • edited by amshinde Loading

jcvenegas commented Apr 19, 2018

jcvenegas commented Apr 20, 2018

klynnrif left a comment

Choose a reason for hiding this comment

jodh-intel commented Apr 19, 2018 •

edited by amshinde

Loading