From fd698acee9afb4f3f3351fe16f15dec28a4cc1f0 Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Tue, 13 Jul 2021 16:02:18 -0500 Subject: [PATCH 01/10] experiment mariner with netpolicy off --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index fb4981f5e..26827fd58 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -57,7 +57,7 @@ "sync_from_dbgap": "False", "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", "dispatcher_job_num": "10", - "netpolicy": "on" + "netpolicy": "off" }, "canary": { "default": 0 From 460452d3a92f20977fea8d8ce33841686cf2a29c Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Tue, 13 Jul 2021 16:04:07 -0500 Subject: [PATCH 02/10] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 23005e239..3f991dc2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!groovy -@Library('cdis-jenkins-lib@master') _ +@Library('cdis-jenkins-lib@fix/replace_netpolicy_in_new_manifest') _ testPipeline { MANIFEST = "True" } From d70d9a68a806db27ed3b32f290172724598962c0 Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Tue, 13 Jul 2021 16:50:11 -0500 Subject: [PATCH 03/10] Update manifest.json --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index 26827fd58..fb4981f5e 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -57,7 +57,7 @@ "sync_from_dbgap": "False", "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", "dispatcher_job_num": "10", - "netpolicy": "off" + "netpolicy": "on" }, "canary": { "default": 0 From 460998be7079f827b7a0436e3ac9eaf0f3f71ba6 Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Tue, 13 Jul 2021 16:55:16 -0500 Subject: [PATCH 04/10] Update manifest.json --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index fb4981f5e..26827fd58 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -57,7 +57,7 @@ "sync_from_dbgap": "False", "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", "dispatcher_job_num": "10", - "netpolicy": "on" + "netpolicy": "off" }, "canary": { "default": 0 From f8d728b2d4fdf391a5a3a757043253d9eb26552c Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Thu, 15 Jul 2021 10:30:53 -0500 Subject: [PATCH 05/10] Update manifest.json --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index 26827fd58..fb4981f5e 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -57,7 +57,7 @@ "sync_from_dbgap": "False", "useryaml_s3path": "s3://cdis-gen3-users/qa/user.yaml", "dispatcher_job_num": "10", - "netpolicy": "off" + "netpolicy": "on" }, "canary": { "default": 0 From 690c5f9b1d07bb0472cdab96aa9447879768daf2 Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Thu, 15 Jul 2021 10:45:49 -0500 Subject: [PATCH 06/10] Update manifest.json --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index fb4981f5e..b6a254272 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -1,6 +1,6 @@ { "notes": [ - "This is the dev environment manifest", + "This is the dev environment manifest.", "That's all I have to say" ], "jenkins": { From 6639a63b6a8af1ec19d4789558be983daf50d45f Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Thu, 29 Jul 2021 13:20:47 -0500 Subject: [PATCH 07/10] Update manifest.json --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index b6a254272..26548db8f 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -17,7 +17,7 @@ "hatchery": "quay.io/cdis/hatchery:0.1.3", "indexd": "quay.io/cdis/indexd:2021.01", "manifestservice": "quay.io/cdis/manifestservice:0.3.0", - "mariner": "quay.io/cdis/mariner-server:2020.12", + "mariner": "quay.io/cdis/mariner-server:2021.04", "ohdsi-atlas": "quay.io/cdis/ohdsi-atlas:latest", "ohdsi-webapi": "quay.io/cdis/ohdsi-webapi:latest", "peregrine": "quay.io/cdis/peregrine:2021.01", From 048fb257cd6fb0175b00c78265ae8c6853330adb Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Thu, 29 Jul 2021 13:22:04 -0500 Subject: [PATCH 08/10] Update mariner.json --- qa-mickey.planx-pla.net/manifests/mariner/mariner.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qa-mickey.planx-pla.net/manifests/mariner/mariner.json b/qa-mickey.planx-pla.net/manifests/mariner/mariner.json index b7cc2a4a1..9889417be 100644 --- a/qa-mickey.planx-pla.net/manifests/mariner/mariner.json +++ b/qa-mickey.planx-pla.net/manifests/mariner/mariner.json @@ -29,7 +29,7 @@ "containers": { "engine": { "name": "mariner-engine", - "image": "quay.io/cdis/mariner-engine:2020.12", + "image": "quay.io/cdis/mariner-engine:2021.04", "pull_policy": "always", "command": [ "/mariner", @@ -45,7 +45,7 @@ }, "s3sidecar": { "name": "mariner-s3sidecar", - "image": "quay.io/cdis/mariner-s3sidecar:2020.12", + "image": "quay.io/cdis/mariner-s3sidecar:2021.04", "pull_policy": "always", "command": [ "/sidecar" @@ -62,7 +62,7 @@ }, "gen3fusesidecar": { "name": "mariner-gen3fusesidecar", - "image": "quay.io/cdis/gen3fuse-sidecar:2020.12", + "image": "quay.io/cdis/gen3fuse-sidecar:2021.04", "pull_policy": "always", "command": [ "/bin/bash", From 42c2d9342f1f8029983b73251531b78aeb964c5c Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Thu, 29 Jul 2021 13:53:55 -0500 Subject: [PATCH 09/10] Update manifest.json --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index 0568a7915..776da3bdd 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -18,7 +18,7 @@ "indexd": "quay.io/cdis/indexd:2021.04", "manifestservice": "quay.io/cdis/manifestservice:0.3.0", "metadata": "quay.io/cdis/metadata-service:2021.04", - "mariner": "quay.io/cdis/mariner-server:2021.04", + "mariner": "quay.io/cdis/mariner-server:2021.08", "ohdsi-atlas": "quay.io/cdis/ohdsi-atlas:latest", "ohdsi-webapi": "quay.io/cdis/ohdsi-webapi:latest", "peregrine": "quay.io/cdis/peregrine:2021.04", From 37c22870ff2de473286e8feb3ce84ab9598c7deb Mon Sep 17 00:00:00 2001 From: Jing Huang <71466688+jingh8@users.noreply.github.com> Date: Thu, 29 Jul 2021 14:31:21 -0500 Subject: [PATCH 10/10] Update manifest.json --- qa-mickey.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-mickey.planx-pla.net/manifest.json b/qa-mickey.planx-pla.net/manifest.json index 776da3bdd..0568a7915 100644 --- a/qa-mickey.planx-pla.net/manifest.json +++ b/qa-mickey.planx-pla.net/manifest.json @@ -18,7 +18,7 @@ "indexd": "quay.io/cdis/indexd:2021.04", "manifestservice": "quay.io/cdis/manifestservice:0.3.0", "metadata": "quay.io/cdis/metadata-service:2021.04", - "mariner": "quay.io/cdis/mariner-server:2021.08", + "mariner": "quay.io/cdis/mariner-server:2021.04", "ohdsi-atlas": "quay.io/cdis/ohdsi-atlas:latest", "ohdsi-webapi": "quay.io/cdis/ohdsi-webapi:latest", "peregrine": "quay.io/cdis/peregrine:2021.04",