mirror of
https://github.com/goharbor/harbor
synced 2024-09-20 10:25:31 +00:00
Update E2E test engine images (#19544)
Fix #19283 1. Bump up chromedriver version to 119.0.6045.105 2. Bump up containerd version to 1.7.8 3. Bump up docker compose version to 2.23.0 4. Bump up helm version to 3.13.1 5. Bump up ORSA version to 1.1.0 6. Bump up imgpkg version to 0.39.0 7. Bump up cosign version to 2.2.0 8. Add install notation 1.0.0 Signed-off-by: Yang Jiao <jiaoya@vmware.com>
This commit is contained in:
Yang Jiao
GitHub
parent
b8f65bb281
commit
6d238f1948
|
|
@ -32,21 +32,22 @@ Init Chrome Driver
|
|||
Create Directory ${download_directory}
|
||||
Run pkill chromedriver
|
||||
Run pkill chrome
|
||||
${chrome options}= Evaluate sys.modules['selenium.webdriver'].ChromeOptions() sys
|
||||
${options}= Evaluate sys.modules['selenium.webdriver'].ChromeOptions() sys
|
||||
${capabilities}= Evaluate sys.modules['selenium.webdriver'].DesiredCapabilities.CHROME sys
|
||||
${prefs} Create Dictionary download.default_directory=${download_directory}
|
||||
Set To Dictionary ${capabilities} acceptInsecureCerts ${True}
|
||||
Call Method ${chrome options} add_experimental_option prefs ${prefs}
|
||||
Call Method ${chrome options} add_argument --headless
|
||||
Call Method ${chrome options} add_argument --disable-gpu
|
||||
Call Method ${chrome options} add_argument --start-maximized
|
||||
Call Method ${chrome options} add_argument --no-sandbox
|
||||
Call Method ${chrome options} add_argument --window-size\=1600,900
|
||||
${chrome options.binary_location} Set Variable /usr/bin/google-chrome
|
||||
#Create Webdriver Chrome Chrome_headless chrome_options=${chrome options} desired_capabilities=${capabilities}
|
||||
Call Method ${options} add_experimental_option prefs ${prefs}
|
||||
Call Method ${options} add_argument --headless
|
||||
Call Method ${options} add_argument --disable-gpu
|
||||
Call Method ${options} add_argument --start-maximized
|
||||
Call Method ${options} add_argument --no-sandbox
|
||||
Call Method ${options} add_argument --window-size\=1600,900
|
||||
Call Method ${options} add_argument --ignore-certificate-errors
|
||||
Call Method ${options} add_argument --allow-insecure-localhost
|
||||
${options.binary_location} Set Variable /usr/bin/google-chrome
|
||||
FOR ${n} IN RANGE 1 6
|
||||
Log To Console Trying Create Webdriver ${n} times ...
|
||||
${out} Run Keyword And Ignore Error Create Webdriver Chrome Chrome_headless chrome_options=${chrome options} desired_capabilities=${capabilities}
|
||||
${out} Run Keyword And Ignore Error Create Webdriver Chrome Chrome_headless options=${options}
|
||||
Log To Console Return value is ${out[0]}
|
||||
Exit For Loop If '${out[0]}'=='PASS'
|
||||
Sleep 2
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ ENV HELM_EXPERIMENTAL_OCI=1
|
|||
ENV COSIGN_PASSWORD=Harbor12345
|
||||
ENV COSIGN_EXPERIMENTAL=1
|
||||
ENV COSIGN_OCI_EXPERIMENTAL=1
|
||||
ENV NOTATION_EXPERIMENTAL=1
|
||||
|
||||
COPY --from=tool_builder /tool/tools.tar.gz /usr/local/bin
|
||||
|
||||
|
|
|
|||
|
|
@ -22,20 +22,20 @@ RUN apt-get update && apt-get install -y software-properties-common && \
|
|||
|
||||
RUN pwd && mkdir /tool/binary && \
|
||||
# Install CONTAINERD
|
||||
CONTAINERD_VERSION=1.7.1 && \
|
||||
CONTAINERD_VERSION=1.7.8 && \
|
||||
wget https://github.com/containerd/containerd/releases/download/v$CONTAINERD_VERSION/containerd-$CONTAINERD_VERSION-linux-amd64.tar.gz && \
|
||||
tar zxvf containerd-$CONTAINERD_VERSION-linux-amd64.tar.gz && \
|
||||
cd bin && cp -f containerd ctr /tool/binary/ && \
|
||||
# docker compose
|
||||
curl -L "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-$(uname -s)-$(uname -m)" -o /tool/binary/docker-compose && \
|
||||
curl -L "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-$(uname -s)-$(uname -m)" -o /tool/binary/docker-compose && \
|
||||
chmod +x /tool/binary/docker-compose && \
|
||||
# Install helm
|
||||
HELM_VERSION=3.12.0 && wget https://get.helm.sh/helm-v$HELM_VERSION-linux-amd64.tar.gz && \
|
||||
HELM_VERSION=3.13.1 && wget https://get.helm.sh/helm-v$HELM_VERSION-linux-amd64.tar.gz && \
|
||||
tar zxvf helm-v$HELM_VERSION-linux-amd64.tar.gz && \
|
||||
ls || pwd && \
|
||||
mv linux-amd64/helm /tool/binary/helm && \
|
||||
# Install ORAS
|
||||
ORAS_VERSION=1.0.0 && curl -LO https://github.com/deislabs/oras/releases/download/v$ORAS_VERSION/oras_${ORAS_VERSION}_linux_amd64.tar.gz && \
|
||||
ORAS_VERSION=1.1.0 && curl -LO https://github.com/deislabs/oras/releases/download/v$ORAS_VERSION/oras_${ORAS_VERSION}_linux_amd64.tar.gz && \
|
||||
mkdir -p oras-install/ && \
|
||||
tar -zxf oras_${ORAS_VERSION}_*.tar.gz -C oras-install/ && \
|
||||
mv oras-install/oras /tool/binary/ && \
|
||||
|
|
@ -54,11 +54,15 @@ RUN pwd && mkdir /tool/binary && \
|
|||
WASM_TO_OCI_VERSION=0.1.2 && wget https://github.com/engineerd/wasm-to-oci/releases/download/v${WASM_TO_OCI_VERSION}/linux-amd64-wasm-to-oci && \
|
||||
chmod +x linux-amd64-wasm-to-oci && mv linux-amd64-wasm-to-oci /tool/binary/wasm-to-oci && \
|
||||
# Install imgpkg
|
||||
IMGPKG_VERSION=0.36.2 && wget https://github.com/vmware-tanzu/carvel-imgpkg/releases/download/v$IMGPKG_VERSION/imgpkg-linux-amd64 && \
|
||||
IMGPKG_VERSION=0.39.0 && wget https://github.com/vmware-tanzu/carvel-imgpkg/releases/download/v$IMGPKG_VERSION/imgpkg-linux-amd64 && \
|
||||
mv imgpkg-linux-amd64 /tool/binary/imgpkg && chmod +x /tool/binary/imgpkg && \
|
||||
# Install cosign
|
||||
COSIGN_VERSION=2.0.2 && wget https://github.com/sigstore/cosign/releases/download/v$COSIGN_VERSION/cosign-linux-amd64 && \
|
||||
COSIGN_VERSION=2.2.0 && wget https://github.com/sigstore/cosign/releases/download/v$COSIGN_VERSION/cosign-linux-amd64 && \
|
||||
mv cosign-linux-amd64 /tool/binary/cosign && chmod +x /tool/binary/cosign && \
|
||||
# # Install notation
|
||||
NOTATION_VERSION=1.0.0 && wget https://github.com/notaryproject/notation/releases/download/v$NOTATION_VERSION/notation_${NOTATION_VERSION}_linux_amd64.tar.gz && \
|
||||
tar zxvf notation_${NOTATION_VERSION}_linux_amd64.tar.gz && \
|
||||
mv notation /tool/binary/notation && chmod +x /tool/binary/notation && \
|
||||
pwd
|
||||
|
||||
RUN cd /tool/binary/ && tar czvf tools.tar.gz * && cp tools.tar.gz /tool
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ ENV HELM_EXPERIMENTAL_OCI=1
|
|||
ENV COSIGN_PASSWORD=Harbor12345
|
||||
ENV COSIGN_EXPERIMENTAL=1
|
||||
ENV COSIGN_OCI_EXPERIMENTAL=1
|
||||
ENV NOTATION_EXPERIMENTAL=1
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends wget curl gnupg2
|
||||
RUN apt-get install libseccomp2
|
||||
RUN wget --no-check-certificate -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
|
||||
|
|
@ -39,9 +41,9 @@ RUN pip3 install --upgrade pip pyasn1 google-apitools==0.5.31 gsutil \
|
|||
requests dbbot robotframework-seleniumlibrary robotframework-pabot \
|
||||
robotframework-JSONLibrary hurry.filesize --upgrade && \
|
||||
apt-get clean all
|
||||
# Upgrade chromedriver version to 113.0.5672.24
|
||||
RUN wget -N https://chromedriver.storage.googleapis.com/113.0.5672.24/chromedriver_linux64.zip && \
|
||||
unzip chromedriver_linux64.zip && \
|
||||
# Upgrade chromedriver version to 119.0.6045.105
|
||||
RUN wget -N https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/119.0.6045.105/linux64/chromedriver-linux64.zip && \
|
||||
unzip -j chromedriver-linux64.zip && \
|
||||
chmod +x chromedriver && \
|
||||
mv -f chromedriver /usr/local/share/chromedriver && \
|
||||
ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver && \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user