From d37de75ac653e19002e4e352181c5dc9243cc483 Mon Sep 17 00:00:00 2001
From: "Aykut M. Bulgu" <mabulgu@gmail.com>
Date: Wed, 10 Mar 2021 17:54:40 +0300
Subject: [PATCH] make changes regarding ocp4.6 (#30)

Since OCP 4.6 is live in prod, I am merging this PR.
---
 .gitignore                        |  5 +++++
 greeting-console/Jenkinsfile      |  2 +-
 greeting-service/Jenkinsfile      |  2 +-
 jenkins-agents/node-14/Dockerfile | 20 --------------------
 4 files changed, 7 insertions(+), 22 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 jenkins-agents/node-14/Dockerfile

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..a84227d36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+# Visual Studio Code
+.vscode
+
+# OSX
+.DS_Store
\ No newline at end of file
diff --git a/greeting-console/Jenkinsfile b/greeting-console/Jenkinsfile
index 95f8c30fe..aa14c3d94 100644
--- a/greeting-console/Jenkinsfile
+++ b/greeting-console/Jenkinsfile
@@ -1,6 +1,6 @@
 pipeline{
     agent{
-        label "jenkins-agent-node-14"
+        label "nodejs"
     }
     stages{
         stage("Install dependencies"){
diff --git a/greeting-service/Jenkinsfile b/greeting-service/Jenkinsfile
index 1038eb129..5f3129db8 100644
--- a/greeting-service/Jenkinsfile
+++ b/greeting-service/Jenkinsfile
@@ -1,6 +1,6 @@
 pipeline{
     agent{
-        label "jenkins-agent-node-14"
+        label "nodejs"
     }
     stages{
         stage("Install dependencies"){
diff --git a/jenkins-agents/node-14/Dockerfile b/jenkins-agents/node-14/Dockerfile
deleted file mode 100644
index 9c667e05d..000000000
--- a/jenkins-agents/node-14/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM quay.io/openshift/origin-jenkins-agent-base:4.5
-
-ENV NODEJS_VERSION=14 \
-    NPM_CONFIG_PREFIX=$HOME/.npm-global \
-    PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH
-
-RUN curl --silent --location https://rpm.nodesource.com/setup_${NODEJS_VERSION}.x | bash -
-
-RUN INSTALL_PKGS="nodejs" && \
-    yum $DISABLE_REPOS install -y --setopt=tsflags=nodocs --disablerepo='rhel-*' \
-      $INSTALL_PKGS && \
-    rpm -V $INSTALL_PKGS && \
-    yum clean all -y && \
-    rm -rf /var/cache/yum && \
-    npm install --unsafe-perm -g npm-audit-html npm-audit-ci-wrapper sonar-scanner || cat /home/jenkins/.npm/_logs/*-debug.log && \
-    chown root:root /home/jenkins -R && \
-    chmod 775 /home/jenkins/.config -R && \
-    chmod 775 /home/jenkins/.npm -R
-
-USER 1001