Skip to content

USHIFT-1287, USHIFT-1315: prepare EC 1 build #1892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Jun 7, 2023
Merged

USHIFT-1287, USHIFT-1315: prepare EC 1 build #1892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f284980
USHIFT-1315: restore build dependency on golang
dhellmann Jun 6, 2023
4828ff2
USHIFT-1287: update image references to 4.14 EC 1 build
dhellmann May 30, 2023
4544c49
USHIFT-1315: add golang to configure-vm.sh
dhellmann Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.14.0-0.nightly-arm64-2023-06-05-185316"
"base": "4.14.0-ec.1"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e381a2cc59632fe5f30fa0081af005a9319711e33a3da22833b9f10aa1acd483",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08e1448760627a193fdce0cccc1f01c516555b890d9ddb816bb11704bd657040",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0cdd5379e7c290dc054241724fa00f2c6aa57b74607f3ddec32bd5af460f4b1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb4624ae6ca43927a96a0c45c14ea5653f9efefe0c68461a312c11993314de2",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5aae06a0a08fa282caf16bea2edfb6ea1563c32df06cd310de443f690936ed03",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4e9d055dfe72422f8178aa8a028d71f4f0c1724c97ab889ec11aaeedf9ca320",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bf2bed81d16afc7fa62e261e3ceefe62b0c2572af115e95058d3d000159a60f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb7d055d6b386eb5a9e2244e6bd6e233968c748b1d6776fab6b06a695572c399",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:771d3089075769224171eee4a9bf4d60b8567398b31776606d163953c2588972",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ced9ae0ec0058f6f7ecb83e958f3b158d9ed99a3663c7e2188dc69dbd8779c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18d52f0a34b818b2245398ba6b9003bbb320e8c4c36bd18db3f4399746a4b698",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3db7fc2e06a52e7f1438247b50a2328ab9dad5793e66753f8c3dd2c3394ab05",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf5de561238db5394abdacaffb04687db7fb8745c8ea679f65fc09000949a677",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88e1098f18b1a82c2a3f741f27621fc99875f1ac51a741d47a2bcafd9bc14ec2",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
Expand Down
16 changes: 8 additions & 8 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.14.0-0.nightly-2023-06-05-112833"
"base": "4.14.0-ec.1"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8c2f14fc5a2544a086fd0e500dda8292261ce481f8d477b40160f2b170c49bc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d666db9fefcd003c718fe603e88a6b2c121cb7c4e684a0578788229b34280d42",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18f6e02a8e826391b46349871700d53f858666a9b6d9cd03ee56fa7353a57b9a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a95f62b191c4cb58eafe74fcef2fef4d1ffc31b40c10aa7bc6c89822a4016779",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b7910b51cba486ff90439027ce4cbacbdd0f784460bedbf764b538b2e8c1397",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd5f22e812a592cb182ff60f64d4d0c0a35f044ce8be8c15be30bc0472b64024",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81f4f8ba81f066238edbf440b5450cfacdc163dbddf7b41b1889a65cc6eb5701",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:014cf1d1b17794ca550a80ce944666188cd3117f6dafb84d1107fa9bc108c82b",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0d73ba49f856fb5f28bc60e8d1b014b0a45bce66c5f9ea9dc5b83ce4f2472ce",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c1ea92a17b839c922f89950f7016035bfe7848d349f359efa90fd05d96011aa",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee80a539310fe3dcbd379bc0e07f6df9fdaeb601effb592abc10fd5db0093f67",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97ccaf3f7e0d31dfb3018e7a7c78ba93ad156420e7d9092e8b0921a0602cd2a1",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d528ad0718d847c8ceb3137eb2e46d1d4f5c7f55035988cb05cbf82a825e2a4",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9d199c1fc8ead5293f91489cc6c6f906570943cb5df31a2e97fb1d943865bbe",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c1ea92a17b839c922f89950f7016035bfe7848d349f359efa90fd05d96011aa"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d528ad0718d847c8ceb3137eb2e46d1d4f5c7f55035988cb05cbf82a825e2a4"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49ced9ae0ec0058f6f7ecb83e958f3b158d9ed99a3663c7e2188dc69dbd8779c"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf5de561238db5394abdacaffb04687db7fb8745c8ea679f65fc09000949a677"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
14 changes: 14 additions & 0 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ BuildRequires: make
BuildRequires: policycoreutils
BuildRequires: systemd

# DO NOT REMOVE
#
# Without the dependency on the compiler via this file, the production
# build pipeline does not work. Sometimes that pipeline requires
# compiling with a version of go that is not released into public RHEL
# repos, yet, so we do not specify a version here. Instead, the
# version is checked in the prep step below.
#
BuildRequires: golang
# DO NOT REMOVE
Copy link
Copy Markdown
Contributor

@ggiguash ggiguash Jun 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove DO NO REMOVE statements. The comment seems to be enough on explaining why we keep it there.


Requires: cri-o >= 1.25
Requires: cri-tools >= 1.25
Requires: iptables
Expand Down Expand Up @@ -322,6 +333,9 @@ systemctl enable --now --quiet openvswitch || true
# Use Git command to generate the log and replace the VERSION string
# LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec
%changelog
* Tue Jun 6 2023 Doug Hellmann <dhellmann@redhat.com> 4.14.0
- Restore golang BuildRequires setting

* Mon May 15 2023 Doug Hellmann <dhellmann@redhat.com> 4.14.0
- Remove version specifier for container-selinux to let the system
make the best choice.
Expand Down
2 changes: 1 addition & 1 deletion scripts/devenv-builder/configure-vm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fi
if ${INSTALL_BUILD_DEPS} || ${BUILD_AND_RUN}; then
sudo dnf clean all -y
sudo dnf update -y
sudo dnf install -y gcc git cockpit make jq selinux-policy-devel rpm-build jq bash-completion
sudo dnf install -y gcc git golang cockpit make jq selinux-policy-devel rpm-build jq bash-completion
sudo systemctl enable --now cockpit.socket
fi

Expand Down