Merge "Revert "allow host name resolution for for voltha-api and etcd ingress""
diff --git a/jjb/pipeline/voltha/physical-build.groovy b/jjb/pipeline/voltha/physical-build.groovy
index 17d48b3..9dfb588 100755
--- a/jjb/pipeline/voltha/physical-build.groovy
+++ b/jjb/pipeline/voltha/physical-build.groovy
@@ -16,6 +16,7 @@
// NOTE we are importing the library even if it's global so that it's
// easier to change the keywords during a replay
+
library identifier: 'cord-jenkins-libraries@master',
retriever: modernSCM([
$class: 'GitSCMSource',
diff --git a/vars/installVoltctl.groovy b/vars/installVoltctl.groovy
index 560a207..61370e6 100644
--- a/vars/installVoltctl.groovy
+++ b/vars/installVoltctl.groovy
@@ -47,31 +47,6 @@
}
// -----------------------------------------------------------------------
-// Intent: Add host entries to /etc/hosts to allow resolving the virtual hosts
-// used to expose the voltha api (voltha.voltha.local) and etcd
-// (voltha-infra.local) inside of k8s via ingress to localhost
-// -----------------------------------------------------------------------
-void setHostEntries() {
- enter('setHostEntries')
-
- sh(
- label : 'setHostEntries',
- script: """#!/usr/bin/env bash
-for hostname in voltha.voltha.local voltha-infra.local; do
- if grep \$hostname /etc/hosts; then
- echo "host entry for \$hostname already exists"
- else
- echo "adding host entry for \$hostname"
- sed -i "s/127.0.0.1 localhost/& \$hostname/" /etc/hosts
- fi
-done
-""")
-
- leave('setHostEntries')
- return
-}
-
-// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
Boolean process(String branch) {
Boolean ans = true
@@ -202,7 +177,6 @@
def call(String branch) {
try {
enter('main')
- setHostEntries()
process(branch)
}
catch (Exception err) { // groovylint-disable-line CatchException