Skip to content

Commit

Permalink
test: fix apt update "changed its 'Suite' value from 'stable' to 'old…
Browse files Browse the repository at this point in the history
…stable'" (#6351)

* test: fix build proxy image

* chore: upgrade sample test image

* update cloud image

* fix 2
  • Loading branch information
Bobgy authored Aug 16, 2021
1 parent 434e5c3 commit 78200c8
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
5 changes: 3 additions & 2 deletions proxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
# limitations under the License.

# Pin to a specific version of invert proxy agent
FROM gcr.io/inverting-proxy/agent@sha256:2e3c5ecd1a55b32056f3ce0c4aaac05e31b85c361d501bf3f8a81bec14c4fe87
FROM gcr.io/inverting-proxy/agent@sha256:762c500f748e00753e6b1af0a273e0097130344a793258108b3886789e2fe744

RUN apt-get update && apt-get install -y curl jq python-pip
# We need --allow-releaseinfo-change, because of https://github.com/kubeflow/pipelines/issues/6311#issuecomment-899224137.
RUN apt update --allow-releaseinfo-change && apt-get install -y curl jq python-pip
COPY requirements.txt .
RUN python2 -m pip install -r \
requirements.txt --quiet --no-cache-dir \
Expand Down
5 changes: 2 additions & 3 deletions test/api-integration-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This image has the script to kick off the ML pipeline API integration test,
# and upload the result to GCS

FROM golang:1.13.15
FROM golang:1.16

RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz > /tmp/google-cloud-sdk.tar.gz
RUN mkdir -p /usr/local/gcloud
Expand All @@ -10,8 +10,7 @@ RUN /usr/local/gcloud/google-cloud-sdk/install.sh
ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin

# install go-junit-report. It converts go test result to junit xml.
RUN go get -u github.com/jstemmer/go-junit-report
RUN go build github.com/jstemmer/go-junit-report
RUN go install github.com/jstemmer/go-junit-report@latest

COPY . /go/src/github.com/kubeflow/pipelines

Expand Down
5 changes: 2 additions & 3 deletions test/initialization-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This image has the script to kick off the ML pipeline initialization test,
# and upload the result to GCS

FROM golang:1.13.15
FROM golang:1.16

RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz > /tmp/google-cloud-sdk.tar.gz
RUN mkdir -p /usr/local/gcloud
Expand All @@ -10,8 +10,7 @@ RUN /usr/local/gcloud/google-cloud-sdk/install.sh
ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin

# install go-junit-report. It converts go test result to junit xml.
RUN go get -u github.com/jstemmer/go-junit-report
RUN go build github.com/jstemmer/go-junit-report
RUN go install github.com/jstemmer/go-junit-report@latest

COPY . /go/src/github.com/kubeflow/pipelines

Expand Down
2 changes: 1 addition & 1 deletion test/sample-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This image has the script to kick off the ML pipeline sample e2e test,

FROM google/cloud-sdk:315.0.0
FROM google/cloud-sdk:352.0.0

RUN apt-get update -y
RUN apt-get install --no-install-recommends -y -q libssl-dev libffi-dev wget ssh
Expand Down
2 changes: 1 addition & 1 deletion test/sample-test/hack/update_requirements.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
set -ex

cat ../../sdk/python/requirements.in ../../backend/api/python_http_client/requirements.txt ../../backend/requirements.in requirements.in | \
../../backend/update_requirements.sh google/cloud-sdk:315.0.0 >requirements.txt
../../backend/update_requirements.sh google/cloud-sdk:352.0.0 >requirements.txt
15 changes: 8 additions & 7 deletions test/sample-test/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ absl-py==0.11.0 # via -r -, ml-metadata, ml-pipelines-sdk, tensorboard
ansiwrap==0.8.4 # via papermill
apache-beam[gcp]==2.31.0 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-transform, tfx, tfx-bsl
appdirs==1.4.4 # via black
argcomplete==1.12.3 # via ipykernel
argon2-cffi==20.1.0 # via notebook
astunparse==1.6.3 # via tensorflow
async-generator==1.10 # via nbclient
Expand Down Expand Up @@ -70,8 +71,8 @@ h5py==3.1.0 # via tensorflow
hdfs==2.6.0 # via apache-beam
httplib2==0.19.1 # via apache-beam, google-api-python-client, google-apitools, google-auth-httplib2, oauth2client
idna==3.2 # via requests
importlib-metadata==3.10.1 # via ipykernel, jsonschema, markdown
ipykernel==6.0.3 # via ipywidgets, notebook
importlib-metadata==4.6.4 # via argcomplete, ipykernel, jsonschema, markdown
ipykernel==6.1.0 # via ipywidgets, notebook
ipython-genutils==0.2.0 # via nbformat, notebook, traitlets
ipython==7.26.0 # via ipykernel, ipywidgets, tensorflow-model-analysis
ipywidgets==7.6.3 # via tensorflow-model-analysis
Expand Down Expand Up @@ -108,7 +109,7 @@ oauth2client==4.1.3 # via apache-beam, google-apitools
oauthlib==3.1.1 # via requests-oauthlib
opt-einsum==3.3.0 # via tensorflow
packaging==20.9 # via bleach, google-api-core, ml-pipelines-sdk, tfx
pandas==1.3.1 # via tensorflow-data-validation, tensorflow-model-analysis, tfx-bsl
pandas==1.3.2 # via tensorflow-data-validation, tensorflow-model-analysis, tfx-bsl
pandocfilters==1.4.3 # via nbconvert
papermill==2.3.3 # via -r -
parso==0.8.2 # via jedi
Expand All @@ -126,7 +127,7 @@ pyasn1-modules==0.2.8 # via google-auth, oauth2client
pyasn1==0.4.8 # via oauth2client, pyasn1-modules, rsa
pycparser==2.20 # via cffi
pydot==1.4.2 # via apache-beam, tensorflow-transform
pygments==2.9.0 # via ipython, jupyterlab-pygments, nbconvert
pygments==2.10.0 # via ipython, jupyterlab-pygments, nbconvert
pymongo==3.12.0 # via apache-beam
pyparsing==2.4.7 # via httplib2, packaging, pydot
pyrsistent==0.18.0 # via jsonschema
Expand Down Expand Up @@ -158,7 +159,7 @@ tensorflow-serving-api==2.5.1 # via tfx, tfx-bsl
tensorflow-transform==1.0.0 # via tfx
tensorflow==2.5.1 # via tensorflow-data-validation, tensorflow-model-analysis, tensorflow-serving-api, tensorflow-transform, tfx, tfx-bsl
termcolor==1.1.0 # via fire, tensorflow
terminado==0.10.1 # via notebook
terminado==0.11.0 # via notebook
terminaltables==3.1.0 # via keras-tuner
testpath==0.5.0 # via nbconvert
textwrap3==0.9.2 # via ansiwrap
Expand All @@ -167,15 +168,15 @@ tfx==1.0.0 # via -r -
threadpoolctl==2.2.0 # via scikit-learn
tomli==1.2.1 # via black
tornado==6.1 # via ipykernel, jupyter-client, notebook, terminado
tqdm==4.62.0 # via keras-tuner, papermill
tqdm==4.62.1 # via keras-tuner, papermill
traitlets==5.0.5 # via ipykernel, ipython, ipywidgets, jupyter-client, jupyter-core, matplotlib-inline, nbclient, nbconvert, nbformat, notebook
typed-ast==1.4.3 # via black
typing-extensions==3.7.4.3 # via apache-beam, black, importlib-metadata, tensorflow
uritemplate==3.0.1 # via google-api-python-client
urllib3==1.26.6 # via -r -, kfp-server-api, kubernetes, minio, requests
wcwidth==0.2.5 # via prompt-toolkit
webencodings==0.5.1 # via bleach
websocket-client==1.2.0 # via docker, kubernetes
websocket-client==1.2.1 # via docker, kubernetes
werkzeug==2.0.1 # via tensorboard
wheel==0.37.0 # via astunparse, strip-hints, tensorboard, tensorflow
widgetsnbextension==3.5.1 # via ipywidgets
Expand Down

0 comments on commit 78200c8

Please sign in to comment.