Skip to content

Commit

Permalink
google-cloud-sdk -> google-cloud-cli in EL images (#2247)
Browse files Browse the repository at this point in the history
  • Loading branch information
a-crate authored Dec 7, 2023
1 parent fb1e912 commit 0f47210
Show file tree
Hide file tree
Showing 36 changed files with 56 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyAMA0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ echo "ip_resolve=4" >> /etc/yum.conf

# Install GCE guest packages and CloudSDK.
yum install -y google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-sdk
rpm -q google-cloud-sdk google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-cli
rpm -q google-cloud-cli google-compute-engine google-osconfig-agent gce-disk-expand

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ echo "ip_resolve=4" >> /etc/yum.conf

# Install GCE guest packages and CloudSDK.
yum install -y google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-sdk
rpm -q google-cloud-sdk google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-cli
rpm -q google-cloud-cli google-compute-engine google-osconfig-agent gce-disk-expand

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ echo "ip_resolve=4" >> /etc/yum.conf

# Install GCE guest packages and CloudSDK.
yum install -y google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-sdk
rpm -q google-cloud-sdk google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-cli
rpm -q google-cloud-cli google-compute-engine google-osconfig-agent gce-disk-expand

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ echo "ip_resolve=4" >> /etc/yum.conf

# Install GCE guest packages and CloudSDK.
yum install -y google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-sdk
rpm -q google-cloud-sdk google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-cli
rpm -q google-cloud-cli google-compute-engine google-osconfig-agent gce-disk-expand

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ echo "ip_resolve=4" >> /etc/yum.conf

# Install GCE guest packages and CloudSDK.
yum install -y google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-sdk
rpm -q google-cloud-sdk google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-cli
rpm -q google-cloud-cli google-compute-engine google-osconfig-agent gce-disk-expand

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ echo "ip_resolve=4" >> /etc/yum.conf

# Install GCE guest packages and CloudSDK.
yum install -y google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-sdk
rpm -q google-cloud-sdk google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-cli
rpm -q google-cloud-cli google-compute-engine google-osconfig-agent gce-disk-expand

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ echo "ip_resolve=4" >> /etc/yum.conf

# Install GCE guest packages and CloudSDK.
yum install -y google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-sdk
rpm -q google-cloud-sdk google-compute-engine google-osconfig-agent gce-disk-expand
yum install -y google-cloud-cli
rpm -q google-cloud-cli google-compute-engine google-osconfig-agent gce-disk-expand

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyAMA0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ EOM
%post --erroronfail
set -x
exec &> /dev/ttyS0
dnf config-manager --set-disabled google-cloud-sdk
dnf config-manager --set-disabled google-cloud-cli
dnf -y install google-rhui-client-rhel9
%end

Expand Down Expand Up @@ -164,9 +164,9 @@ rpm -q google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
# Re-enable the cloud SDK repo
dnf config-manager --set-enabled google-cloud-sdk
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf config-manager --set-enabled google-cloud-cli
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyAMA0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
rpm -q google-cloud-sdk
dnf install -y google-cloud-cli
rpm -q google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ EOL
dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyAMA0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyS0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyAMA0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyS0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Build Failed!" > /dev/ttyAMA0; exit 1; }

# Install the Cloud SDK package.
dnf install -y google-cloud-sdk
dnf install -y google-cloud-cli

# Send /root/anaconda-ks.cfg to our logs.
cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
Expand Down
2 changes: 1 addition & 1 deletion daisy_workflows/kernel_commit_query/suse.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
EOM

zypper -n --no-gpg-checks ref
zypper install -y kernel-source git google-cloud-sdk
zypper install -y kernel-source git google-cloud-cli
rm -rf /files/distro_kernel && mkdir -p /files/distro_kernel
cp -R /usr/src/linux/* /files/distro_kernel

Expand Down

0 comments on commit 0f47210

Please sign in to comment.