Browse code
Update dist tag and change repo, release rpms for 4.0
Change-Id: I9e1e9ceb42a4e105e33428169848d99e8d944c43
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/11433
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Michelle Wang <michellew@vmware.com>
suezzelur authored on 2020/10/08 03:52:34Showing 25 changed files
- SPECS/photon-release/photon-release.spec
- SPECS/photon-repos/photon-repos.spec
- config.json
- support/dockerfiles/k8s-docker-images/Dockerfile.calico-cni
- support/dockerfiles/k8s-docker-images/Dockerfile.calico-k8s-policy
- support/dockerfiles/k8s-docker-images/Dockerfile.calico-node
- support/dockerfiles/k8s-docker-images/Dockerfile.coredns
- support/dockerfiles/k8s-docker-images/Dockerfile.dnsmasq-nanny
- support/dockerfiles/k8s-docker-images/Dockerfile.flannel
- support/dockerfiles/k8s-docker-images/Dockerfile.heapster
- support/dockerfiles/k8s-docker-images/Dockerfile.k8sbase
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-apiserver
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-controller-manager
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-dns
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-proxy
- support/dockerfiles/k8s-docker-images/Dockerfile.kube-scheduler
- support/dockerfiles/k8s-docker-images/Dockerfile.metrics-server
- support/dockerfiles/k8s-docker-images/Dockerfile.nginx-ingress
- support/dockerfiles/k8s-docker-images/Dockerfile.sidecar
- support/dockerfiles/k8s-docker-images/Dockerfile.wavefront-proxy
- support/dockerfiles/photon/make-docker-image.sh
- support/image-builder/ostree-tools/photon-base.json
- support/image-builder/ostree-tools/photon-ostree.repo
- support/image-builder/ova/ovfinfo.txt
- support/image-builder/ova_uefi/ovfinfo.txt
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Photon release files |
| 2 | 2 |
Name: photon-release |
| 3 |
-Version: 3.0 |
|
| 4 |
-Release: 4%{?dist}
|
|
| 3 |
+Version: 4.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: Apache License |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
URL: https://vmware.github.io/photon/ |
| 8 |
-Source0: photon-release-3.0.tar.gz |
|
| 8 |
+Source0: photon-release-4.0.tar.gz |
|
| 9 | 9 |
%define sha1 photon-release=ced639518d32f9ac8ff00a71853812057db3ab3c |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -69,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT |
| 69 | 69 |
%config(noreplace) /etc/issue.net |
| 70 | 70 |
|
| 71 | 71 |
%changelog |
| 72 |
+* Wed Oct 07 2020 Anish Swaminathan <anishs@vmware.com> 4.0-1 |
|
| 73 |
+- Update to 4.0 |
|
| 72 | 74 |
* Wed Sep 23 2020 Michelle Wang <michellew@vmware.com> 3.0-4 |
| 73 | 75 |
- Add sources0 for OSSTP tickets |
| 74 | 76 |
* Sat Jan 04 2020 Neal Gompa <ngompa13@gmail.com> 3.0-3 |
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: Photon repo files, gpg keys |
| 2 | 2 |
Name: photon-repos |
| 3 |
-Version: 3.0 |
|
| 4 |
-Release: 5%{?dist}
|
|
| 3 |
+Version: 4.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: Apache License |
| 6 | 6 |
Group: System Environment/Base |
| 7 | 7 |
URL: https://vmware.github.io/photon/ |
| 8 |
-Source0: photon-repos-3.0.tar.gz |
|
| 8 |
+Source0: photon-repos-4.0.tar.gz |
|
| 9 | 9 |
%define sha1 photon-repos=6dcaac0748e7fba12c4f5f01f05f6aeae5ec7fa3 |
| 10 | 10 |
Source1: VMWARE-RPM-GPG-KEY |
| 11 | 11 |
Source2: photon.repo |
| ... | ... |
@@ -50,6 +50,8 @@ rm -rf $RPM_BUILD_ROOT |
| 50 | 50 |
%config(noreplace) /etc/yum.repos.d/photon-extras.repo |
| 51 | 51 |
|
| 52 | 52 |
%changelog |
| 53 |
+* Wed Oct 07 2020 Anish Swaminathan <anishs@vmware.com> 4.0-1 |
|
| 54 |
+- Update to 4.0 |
|
| 53 | 55 |
* Wed Sep 23 2020 Michelle Wang <michellew@vmware.com> 3.0-5 |
| 54 | 56 |
- Add sources0 for OSSTP tickets |
| 55 | 57 |
* Thu Mar 26 2020 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.0-4 |
| ... | ... |
@@ -1,8 +1,8 @@ |
| 1 | 1 |
{
|
| 2 | 2 |
"photon-build-param" : {
|
| 3 | 3 |
"photon-build-type" : "chroot", |
| 4 |
- "photon-dist-tag" : ".ph3", |
|
| 5 |
- "photon-release-version" : "3.0", |
|
| 4 |
+ "photon-dist-tag" : ".ph4", |
|
| 5 |
+ "photon-release-version" : "4.0", |
|
| 6 | 6 |
"threads" : 1, |
| 7 | 7 |
"loglevel" : "info", |
| 8 | 8 |
"full-package-list-file" : "build_install_options_all.json", |
| ... | ... |
@@ -23,7 +23,7 @@ rm -rf /etc/yum.repos.d/* |
| 23 | 23 |
cat > /etc/yum.repos.d/photon-local.repo <<- EOF |
| 24 | 24 |
|
| 25 | 25 |
[photon-local] |
| 26 |
-name=VMware Photon Linux 3.0($DOCK_ARCH) |
|
| 26 |
+name=VMware Photon Linux 4.0($DOCK_ARCH) |
|
| 27 | 27 |
baseurl=file://$(pwd)/stage/RPMS |
| 28 | 28 |
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY |
| 29 | 29 |
gpgcheck=0 |
| ... | ... |
@@ -3,11 +3,11 @@ |
| 3 | 3 |
|
| 4 | 4 |
"osname": "photon", |
| 5 | 5 |
|
| 6 |
- "releasever": "3.0", |
|
| 6 |
+ "releasever": "4.0", |
|
| 7 | 7 |
|
| 8 |
- "ref": "photon/3.0/x86_64/minimal", |
|
| 8 |
+ "ref": "photon/4.0/x86_64/minimal", |
|
| 9 | 9 |
|
| 10 |
- "automatic_version_prefix": "3.0_minimal", |
|
| 10 |
+ "automatic_version_prefix": "4.0_minimal", |
|
| 11 | 11 |
|
| 12 | 12 |
"repos": ["photon"], |
| 13 | 13 |
|
| ... | ... |
@@ -3,8 +3,8 @@ |
| 3 | 3 |
<Info>Information about the installed software</Info> |
| 4 | 4 |
<Product>Photon OS</Product> |
| 5 | 5 |
<Vendor>VMware Inc.</Vendor> |
| 6 |
- <Version>3.0</Version> |
|
| 7 |
- <FullVersion>3.0</FullVersion> |
|
| 6 |
+ <Version>4.0</Version> |
|
| 7 |
+ <FullVersion>4.0</FullVersion> |
|
| 8 | 8 |
</ProductSection> |
| 9 | 9 |
<EulaSection> |
| 10 | 10 |
<Info>End User License Agreement</Info> |
| ... | ... |
@@ -4,8 +4,8 @@ |
| 4 | 4 |
<Info>Information about the installed software</Info> |
| 5 | 5 |
<Product>Photon OS</Product> |
| 6 | 6 |
<Vendor>VMware Inc.</Vendor> |
| 7 |
- <Version>3.0</Version> |
|
| 8 |
- <FullVersion>3.0</FullVersion> |
|
| 7 |
+ <Version>4.0</Version> |
|
| 8 |
+ <FullVersion>4.0</FullVersion> |
|
| 9 | 9 |
</ProductSection> |
| 10 | 10 |
<EulaSection> |
| 11 | 11 |
<Info>End User License Agreement</Info> |