fix: missing pbt->simple-pbt name changes, add simple-pbt to update-i…

…mages.sh update yaml function (causing failing gha).
kubeflow · Jun 21, 2022 · 5cf08b3 · 5cf08b3
1 parent 6962ad7
commit 5cf08b3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/simple-pbt-e2e-test.yaml b/.github/workflows/simple-pbt-e2e-test.yaml
@@ -2,6 +2,9 @@ name: E2E Test with simple-pbt
 on:
   - pull_request
 
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 jobs:
   e2e:
     runs-on: ubuntu-20.04

diff --git a/examples/v1beta1/README.md b/examples/v1beta1/README.md
@@ -44,7 +44,7 @@ Experiments for the following algorithms:
 
 - [HyperBand](./hp-tuning/hyperband.yaml)
 
-- [PBT](./hp-tuning/pbt.yaml)
+- [PBT](./hp-tuning/simple-pbt.yaml)
 
 ### Neural Architecture Search
 

diff --git a/examples/v1beta1/hp-tuning/simple-pbt.yaml b/examples/v1beta1/hp-tuning/simple-pbt.yaml
@@ -43,7 +43,6 @@ spec:
             containers:
               - name: training-container
                 image: docker.io/kubeflowkatib/simple-pbt:latest
-                imagePullPolicy: Always
                 command:
                   - "python3"
                   - "/opt/pbt/pbt_test.py"

diff --git a/scripts/v1beta1/build.sh b/scripts/v1beta1/build.sh
@@ -136,7 +136,7 @@ else
   docker build --platform linux/amd64 -t "${REGISTRY}/darts-cnn-cifar10-gpu:${TAG}" -f examples/${VERSION}/trial-images/darts-cnn-cifar10/Dockerfile.gpu .
 
   echo -e "\nBuilding dynamic learning rate training container example for PBT...\n"
-  docker build --platform linux/amd64 -t "${REGISTRY}/simple-pbt:${TAG}" -f examples/${VERSION}/trial-images/pbt/Dockerfile .
+  docker build --platform linux/amd64 -t "${REGISTRY}/simple-pbt:${TAG}" -f examples/${VERSION}/trial-images/simple-pbt/Dockerfile .
 fi
 
 echo -e "\nBuilding Tensorflow with summaries mnist training container example...\n"

diff --git a/scripts/v1beta1/update-images.sh b/scripts/v1beta1/update-images.sh
@@ -89,6 +89,7 @@ ENAS_GPU="enas-cnn-cifar10-gpu"
 ENAS_CPU="enas-cnn-cifar10-cpu"
 DARTS_GPU="darts-cnn-cifar10-gpu"
 DARTS_CPU="darts-cnn-cifar10-cpu"
+SIMPLE_PBT="simple-pbt"
 
 echo -e "Update Katib Trial training container images\n"
 update_yaml_files "./" "${OLD_PREFIX}${MXNET_MNIST}:.*" "${NEW_PREFIX}${MXNET_MNIST}:${TAG}"
@@ -98,5 +99,6 @@ update_yaml_files "./" "${OLD_PREFIX}${ENAS_GPU}:.*" "${NEW_PREFIX}${ENAS_GPU}:$
 update_yaml_files "./" "${OLD_PREFIX}${ENAS_CPU}:.*" "${NEW_PREFIX}${ENAS_CPU}:${TAG}"
 update_yaml_files "./" "${OLD_PREFIX}${DARTS_GPU}:.*" "${NEW_PREFIX}${DARTS_GPU}:${TAG}"
 update_yaml_files "./" "${OLD_PREFIX}${DARTS_CPU}:.*" "${NEW_PREFIX}${DARTS_CPU}:${TAG}"
+update_yaml_files "./" "${OLD_PREFIX}${SIMPLE_PBT}:.*" "${NEW_PREFIX}${SIMPLE_PBT}:${TAG}"
 
 echo "Katib images have been updated"
diff --git a/test/e2e/v1beta1/hack/aws/argo_workflow.py b/test/e2e/v1beta1/hack/aws/argo_workflow.py
@@ -77,7 +77,7 @@
     "multivariate-tpe":                       "examples/v1beta1/hp-tuning/multivariate-tpe.yaml",
     "cmaes":                                  "examples/v1beta1/hp-tuning/cma-es.yaml",
     "hyperband":                              "examples/v1beta1/hp-tuning/hyperband.yaml",
-    "pbt":                                    "examples/v1beta1/hp-tuning/pbt.yaml",
+    "pbt":                                    "examples/v1beta1/hp-tuning/simple-pbt.yaml",
     "enas":                                   "examples/v1beta1/nas/enas-cpu.yaml",
     "darts":                                  "examples/v1beta1/nas/darts-cpu.yaml",
     "pytorchjob":                             "examples/v1beta1/kubeflow-training-operator/pytorchjob-mnist.yaml",
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,9 @@ name: E2E Test with simple-pbt @@
     on:
       - pull_request
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     jobs:
       e2e:
         runs-on: ubuntu-20.04
@@ Expand Down @@