Skip to content

Commit 67b8301

Browse files
RomanNikitenkoRomanNikitenko
committed
Test
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
1 parent 2713d1f commit 67b8301

File tree

6 files changed

+233
-222
lines changed

6 files changed

+233
-222
lines changed

‎build/dockerfiles/assembly.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Grab content from previously build images
1010
FROM linux-libc-ubi8 as linux-libc-ubi8-content
1111
FROM linux-libc-ubi9 as linux-libc-ubi9-content
12-
FROM linux-musl as linux-musl-content
12+
# FROM linux-musl as linux-musl-content
1313

1414
# https://quay.io/eclipse/che-machine-exec#^7\.
1515
FROM quay.io/eclipse/che-machine-exec:7.56.0 as machine-exec
@@ -22,7 +22,7 @@ RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/
2222

2323
WORKDIR /mnt/rootfs
2424

25-
COPY --from=linux-musl-content --chown=0:0 /checode-linux-musl /mnt/rootfs/checode-linux-musl
25+
# COPY --from=linux-musl-content --chown=0:0 /checode-linux-musl /mnt/rootfs/checode-linux-musl
2626
COPY --from=linux-libc-ubi8-content --chown=0:0 /checode-linux-libc/ubi8 /mnt/rootfs/checode-linux-libc/ubi8
2727
COPY --from=linux-libc-ubi9-content --chown=0:0 /checode-linux-libc/ubi9 /mnt/rootfs/checode-linux-libc/ubi9
2828

‎build/dockerfiles/linux-libc-ubi8.Dockerfile‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -90,56 +90,56 @@ RUN chmod a+x /checode/out/server-main.js \
9090
# Do not change line above! It is used to cut this section to skip tests
9191

9292
# Compile tests
93-
RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \
94-
compile-extension:markdown-language-features \
95-
compile-extension:typescript-language-features \
96-
compile-extension:emmet \
97-
compile-extension:git \
98-
compile-extension:ipynb \
99-
compile-extension-media \
100-
compile-extension:configuration-editing
101-
102-
# Compile test suites
103-
# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile
104-
RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi
105-
106-
# install test dependencies
107-
ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
108-
RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi
109-
# Install procps to manage to kill processes and centos stream repository
110-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
111-
ARCH=$(uname -m) && \
112-
yum install --nobest -y procps \
113-
https://vault.centos.org/centos/8/extras/${ARCH}/os/Packages/epel-release-8-11.el8.noarch.rpm \
114-
https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-3.el8.noarch.rpm \
115-
https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-3.el8.noarch.rpm; \
116-
fi
117-
118-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
119-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
120-
&& yum install -y chromium \
121-
&& PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) \
122-
&& rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" \
123-
&& ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \
124-
fi
125-
126-
# use of retry and timeout
127-
COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh
128-
RUN chmod u+x /opt/app-root/src/retry.sh
129-
130-
# Run integration tests (Browser)
131-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
132-
NODE_ARCH=$(echo "console.log(process.arch)" | node) \
133-
VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
134-
/opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \
135-
fi
136-
137-
# Run smoke tests (Browser)
138-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
139-
NODE_ARCH=$(echo "console.log(process.arch)" | node) \
140-
VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
141-
/opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \
142-
fi
93+
# RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \
94+
# compile-extension:markdown-language-features \
95+
# compile-extension:typescript-language-features \
96+
# compile-extension:emmet \
97+
# compile-extension:git \
98+
# compile-extension:ipynb \
99+
# compile-extension-media \
100+
# compile-extension:configuration-editing
101+
102+
# # Compile test suites
103+
# # https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile
104+
# RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi
105+
106+
# # install test dependencies
107+
# ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
108+
# RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi
109+
# # Install procps to manage to kill processes and centos stream repository
110+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
111+
# ARCH=$(uname -m) && \
112+
# yum install --nobest -y procps \
113+
# https://vault.centos.org/centos/8/extras/${ARCH}/os/Packages/epel-release-8-11.el8.noarch.rpm \
114+
# https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-3.el8.noarch.rpm \
115+
# https://vault.centos.org/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-3.el8.noarch.rpm; \
116+
# fi
117+
118+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
119+
# sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \
120+
# && yum install -y chromium \
121+
# && PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) \
122+
# && rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" \
123+
# && ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \
124+
# fi
125+
126+
# # use of retry and timeout
127+
# COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh
128+
# RUN chmod u+x /opt/app-root/src/retry.sh
129+
130+
# # Run integration tests (Browser)
131+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
132+
# NODE_ARCH=$(echo "console.log(process.arch)" | node) \
133+
# VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
134+
# /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \
135+
# fi
136+
137+
# # Run smoke tests (Browser)
138+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
139+
# NODE_ARCH=$(echo "console.log(process.arch)" | node) \
140+
# VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
141+
# /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \
142+
# fi
143143

144144
# Do not change line below! It is used to cut this section to skip tests
145145
### Ending of tests

‎build/dockerfiles/linux-libc-ubi9.Dockerfile‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -91,56 +91,56 @@ RUN chmod a+x /checode/out/server-main.js \
9191
### Beginning of tests
9292
# Do not change line above! It is used to cut this section to skip tests
9393

94-
# Compile tests
95-
RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \
96-
compile-extension:markdown-language-features \
97-
compile-extension:typescript-language-features \
98-
compile-extension:emmet \
99-
compile-extension:git \
100-
compile-extension:ipynb \
101-
compile-extension-media \
102-
compile-extension:configuration-editing
103-
104-
# # Compile test suites
105-
# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile
106-
RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi
107-
108-
# install test dependencies
109-
ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
110-
RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi
111-
# Install procps to manage to kill processes and centos stream repository
112-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
113-
ARCH=$(uname -m) && \
114-
yum install --nobest -y procps \
115-
https://rpmfind.net/linux/epel/9/Everything/${ARCH}/Packages/e/epel-release-9-9.el9.noarch.rpm \
116-
https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-9.0-23.el9.noarch.rpm \
117-
https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-9.0-23.el9.noarch.rpm; \
118-
fi
119-
120-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
121-
yum install -y chromium && \
122-
PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) && \
123-
rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \
124-
ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \
125-
fi
126-
127-
# use of retry and timeout
128-
COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh
129-
RUN chmod u+x /opt/app-root/src/retry.sh
130-
131-
# Run integration tests (Browser)
132-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
133-
NODE_ARCH=$(echo "console.log(process.arch)" | node) \
134-
VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
135-
/opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \
136-
fi
137-
138-
# Run smoke tests (Browser)
139-
RUN if [ "$(uname -m)" = "x86_64" ]; then \
140-
NODE_ARCH=$(echo "console.log(process.arch)" | node) \
141-
VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
142-
/opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \
143-
fi
94+
# # Compile tests
95+
# RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \
96+
# compile-extension:markdown-language-features \
97+
# compile-extension:typescript-language-features \
98+
# compile-extension:emmet \
99+
# compile-extension:git \
100+
# compile-extension:ipynb \
101+
# compile-extension-media \
102+
# compile-extension:configuration-editing
103+
104+
# # # Compile test suites
105+
# # https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile
106+
# RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi
107+
108+
# # install test dependencies
109+
# ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
110+
# RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi
111+
# # Install procps to manage to kill processes and centos stream repository
112+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
113+
# ARCH=$(uname -m) && \
114+
# yum install --nobest -y procps \
115+
# https://rpmfind.net/linux/epel/9/Everything/${ARCH}/Packages/e/epel-release-9-9.el9.noarch.rpm \
116+
# https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-9.0-23.el9.noarch.rpm \
117+
# https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-9.0-23.el9.noarch.rpm; \
118+
# fi
119+
120+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
121+
# yum install -y chromium && \
122+
# PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) && \
123+
# rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \
124+
# ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \
125+
# fi
126+
127+
# # use of retry and timeout
128+
# COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh
129+
# RUN chmod u+x /opt/app-root/src/retry.sh
130+
131+
# # Run integration tests (Browser)
132+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
133+
# NODE_ARCH=$(echo "console.log(process.arch)" | node) \
134+
# VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
135+
# /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \
136+
# fi
137+
138+
# # Run smoke tests (Browser)
139+
# RUN if [ "$(uname -m)" = "x86_64" ]; then \
140+
# NODE_ARCH=$(echo "console.log(process.arch)" | node) \
141+
# VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
142+
# /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \
143+
# fi
144144

145145
# Do not change line below! It is used to cut this section to skip tests
146146
### Ending of tests

0 commit comments

Comments
 (0)