Revert "make changes regarding ocp4.6 (RedHatTraining#28)" (RedHatTra…

…ining#29) This reverts commit 5c6a963.
wdde · Feb 24, 2021 · a6531de · a6531de
1 parent 5c6a963
commit a6531de
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/greeting-console/Jenkinsfile b/greeting-console/Jenkinsfile
@@ -1,6 +1,6 @@
 pipeline{
     agent{
-        label "nodejs"
+        label "jenkins-agent-node-14"
     }
     stages{
         stage("Install dependencies"){

diff --git a/greeting-service/Jenkinsfile b/greeting-service/Jenkinsfile
@@ -1,6 +1,6 @@
 pipeline{
     agent{
-        label "nodejs"
+        label "jenkins-agent-node-14"
     }
     stages{
         stage("Install dependencies"){

diff --git a/jenkins-agents/node-14/Dockerfile b/jenkins-agents/node-14/Dockerfile
@@ -0,0 +1,20 @@
+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