Skip to content

Commit 2a0fe00

Browse files
committed
fix
1 parent da240bd commit 2a0fe00

File tree

2 files changed

+19
-9
lines changed

2 files changed

+19
-9
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,14 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
218218
TestUtils.ExecAndPrintLog(tag);
219219
TestUtils.ExecAndPrintLog("docker images");
220220

221-
TestUtils.ExecAndPrintLog("docker logout " + System.getenv("REPO_REGISTRY"));
222-
TestUtils.ExecAndPrintLog(
223-
"docker login "
224-
+ System.getenv("REPO_REGISTRY")
225-
+ " -u "
226-
+ System.getenv("REPO_USERNAME")
227-
+ " -p "
228-
+ System.getenv("REPO_PASSWORD"));
221+
// TestUtils.ExecAndPrintLog("docker logout " + System.getenv("REPO_REGISTRY"));
222+
// TestUtils.ExecAndPrintLog(
223+
// "docker login "
224+
// + System.getenv("REPO_REGISTRY")
225+
// + " -u "
226+
// + System.getenv("REPO_USERNAME")
227+
// + " -p "
228+
// + System.getenv("REPO_PASSWORD"));
229229
TestUtils.ExecAndPrintLog("docker push " + newImage);
230230

231231
// login and push image to ocir
@@ -241,7 +241,10 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
241241
242242
// domain.getDomainNS());
243243

244-
TestUtils.ExecAndPrintLog("kubectl delete secret docker-store -n " + domain.getDomainNS());
244+
// TestUtils.ExecAndPrintLog("kubectl delete secret docker-store -n " +
245+
// domain.getDomainNS());
246+
TestUtils.ExecAndPrintLog("kubectl get secret --all-namespaces");
247+
TestUtils.ExecAndPrintLog("kubectl describe secret docker-store");
245248
TestUtils.ExecAndPrintLog(
246249
"kubectl create secret docker-registry docker-store "
247250
+ "--docker-server="
@@ -250,6 +253,8 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
250253
+ System.getenv("REPO_USERNAME")
251254
+ " --docker-password="
252255
+ System.getenv("REPO_PASSWORD")
256+
+ " --docker_email="
257+
+ System.getenv("REPO_EMAIL")
253258
+ " -n "
254259
+ domain.getDomainNS()
255260
+ " --dry-run -o yaml");
@@ -261,6 +266,8 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
261266
+ System.getenv("REPO_USERNAME")
262267
+ " --docker-password="
263268
+ System.getenv("REPO_PASSWORD")
269+
+ " --docker_email="
270+
+ System.getenv("REPO_EMAIL")
264271
+ " -n "
265272
+ domain.getDomainNS()
266273
+ " --dry-run -o yaml | kubectl apply -f - ";

integration-tests/src/test/resources/setupenv.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ if [ "$SHARED_CLUSTER" = "true" ]; then
237237
echo "Provide Docker login details using REPO_REGISTRY, REPO_USERNAME, REPO_PASSWORD & REPO_EMAIL env variables to push the Operator image to the repository."
238238
exit 1
239239
fi
240+
241+
echo "login to $REPO_REGISTRY"
242+
docker login $REPO_REGISTRY -u $REPO_USERNAME -p $REPO_PASSWORD
240243

241244
echo "Creating Registry Secret"
242245
kubectl create secret docker-registry $IMAGE_PULL_SECRET_OPERATOR \

0 commit comments

Comments
 (0)