Add fedora31 to container list

config/Dockerfiles/Jenkinsfile

@@ -11,7 +11,7 @@ env.TARGET_BRANCH = env.ghprbTargetBranch ?: 'develop'
 
 // Needed for podTemplate()
 env.SLAVE_TAG = env.SLAVE_TAG ?: 'stable-' + env.ghprbTargetBranch
-env.FEDORA29_TAG = env.FEDORA29_TAG ?: 'stable-' + env.ghprbTargetBranch
+env.FEDORA31_TAG = env.FEDORA31_TAG ?: 'stable-' + env.ghprbTargetBranch
 env.FEDORA30_TAG = env.FEDORA30_TAG ?: 'stable-' + env.ghprbTargetBranch
 env.CENTOS7_TAG = env.CENTOS7_TAG ?: 'stable-' + env.ghprbTargetBranch
 
@@ -37,7 +37,7 @@ executionID = UUID.randomUUID().toString()
 
 // Pod name to use
 c7podName = 'lp_centos7-' + executionID
-f29podName = 'lp_fedora29-' + executionID
+f31podName = 'lp_fedora31-' + executionID
 f30podName = 'lp_fedora30-' + executionID
 
 def libraries = ['cico-pipeline' : ['master', 'https://github.com/CentOS/cico-pipeline-library.git'],
@@ -75,8 +75,8 @@ properties(
                        description: 'Tag for slave image',
                        name: 'SLAVE_TAG'),
                 string(defaultValue: 'stable-' + env.ghprbTargetBranch,
-                       description: 'Tag for fedora29 image',
-                       name: 'FEDORA29_TAG'),
+                       description: 'Tag for fedora31 image',
+                       name: 'FEDORA31_TAG'),
                 string(defaultValue: 'stable-' + env.ghprbTargetBranch,
                        description: 'Tag for fedora30 image',
                        name: 'FEDORA30_TAG'),
@@ -130,10 +130,10 @@ stage('Tests') {
                 {
                     execute_test(c7podName, "centos7")
                 }
-            }, fedora29: {
+            }, fedora31: {
                 pipelineUtils.clearTemplateNames()
-                podTemplate(name: f29podName,
-                            label: f29podName,
+                podTemplate(name: f31podName,
+                            label: f31podName,
                             cloud: 'openshift',
                             serviceAccount: OPENSHIFT_SERVICE_ACCOUNT,
                             idleMinutes: 0,
@@ -148,11 +148,11 @@ stage('Tests') {
                                 args: '${computer.jnlpmac} ${computer.name}',
                                 command: '',
                                 workingDir: '/workDir'),
-                            containerTemplate(name: 'fedora29',
+                            containerTemplate(name: 'fedora31',
                                 alwaysPullImage: true,
-                                image: DOCKER_REPO_URL + '/' + OPENSHIFT_NAMESPACE + '/fedora29:' + FEDORA29_TAG,
+                                image: DOCKER_REPO_URL + '/' + OPENSHIFT_NAMESPACE + '/fedora31:' + FEDORA31_TAG,
                                 ttyEnabled: false,
-                                command: '/root/init_libvirt.sh',
+                                command: '/usr/bin/tail ',
                                 privileged: true,
                                 workingDir: '/workDir')
                         ],
@@ -161,7 +161,7 @@ stage('Tests') {
                         ]
                 )
                 {
-                    execute_test(f29podName, "fedora29")
+                    execute_test(f31podName, "fedora31")
                 }
             }, fedora30: {
                 pipelineUtils.clearTemplateNames()

config/Dockerfiles/JenkinsfileContainer

@@ -22,7 +22,7 @@ STABLE_LABEL = "stable-" + env.ghprbTargetBranch
 tagMap = [:]
 
 // Initialize
-tagMap['fedora29'] = STABLE_LABEL
+tagMap['fedora31'] = STABLE_LABEL
 tagMap['fedora30'] = STABLE_LABEL
 tagMap['centos7'] = STABLE_LABEL
 
@@ -230,14 +230,14 @@ pipeline {
                 }
             }
         }
-        stage("fedora29 image build") {
+        stage("fedora31 image build") {
             when {
                 // Only build if we have related files in changeset
-                changeset "config/Dockerfiles/fedora29/**"
+                changeset "config/Dockerfiles/fedora31/**"
             }
             steps {
                 script {
-                    tagMap['fedora29'] = pipelineUtils.buildImage(openshiftProject, "fedora29")
+                    tagMap['fedora31'] = pipelineUtils.buildImage(openshiftProject, "fedora31")
                 }
             }
         }
@@ -288,8 +288,8 @@ pipeline {
                                        value: "${env.ghprbPullId}"),
                                 string(name: 'ghprbGhRepository',
                                        value: "${env.ghprbGhRepository}"),
-                                string(name: 'FEDORA29_TAG',
-                                       value: tagMap['fedora29']),
+                                string(name: 'FEDORA31_TAG',
+                                       value: tagMap['fedora31']),
                                 string(name: 'FEDORA30_TAG',
                                        value: tagMap['fedora30']),
                                 string(name: 'CENTOS7_TAG',

config/Dockerfiles/JenkinsfileMergePR

@@ -9,7 +9,7 @@ env.ghprbTargetBranch = env.ghprbTargetBranch ?: 'develop'
 STABLE_LABEL = "stable-" + env.ghprbTargetBranch
 
 // Add new images here
-imageList = ["fedora29", "fedora30", "centos7"]
+imageList = ["fedora31", "fedora30", "centos7"]
 imageOperations = []
 
 library identifier: "ci-pipeline@master",

config/Dockerfiles/JenkinsfileRelease

@@ -36,7 +36,7 @@ env.DOCKER_HUB_IMAGE = env.DOCKER_HUB_IMAGE ?: 'linchpin'
 OPENSHIFT_NAMESPACE = env.OPENSHIFT_NAMESPACE ?: 'continuous-infra'
 OPENSHIFT_SERVICE_ACCOUNT = env.OPENSHIFT_SERVICE_ACCOUNT ?: 'jenkins'
 STABLE_LABEL = 'stable-' + env.ghprbTargetBranch
-env.FEDORA29_TAG = env.FEDORA29_TAG ?: STABLE_LABEL
+env.FEDORA31_TAG = env.FEDORA31_TAG ?: STABLE_LABEL
 env.FEDORA30_TAG = env.FEDORA30_TAG ?: STABLE_LABEL
 
 // Pod name to use
@@ -82,9 +82,9 @@ podTemplate(name: jslave_podName,
                 args: '${computer.jnlpmac} ${computer.name}',
                 command: '',
                 workingDir: '/workDir'),
-            containerTemplate(name: 'fedora29',
+            containerTemplate(name: 'fedora31',
                 alwaysPullImage: true,
-                image: DOCKER_REPO_URL + '/' + OPENSHIFT_NAMESPACE + '/fedora29:' + FEDORA29_TAG,
+                image: DOCKER_REPO_URL + '/' + OPENSHIFT_NAMESPACE + '/fedora31:' + FEDORA31_TAG,
                 ttyEnabled: false,
                 command: '',
                 privileged: true,
@@ -183,15 +183,15 @@ EOF
                     currentStage = 'test-pypi-install'
                     stage(currentStage) {
                       dir(repoName) {
-                        pipelineUtils.executeInContainer(currentStage, "fedora29", "./config/Dockerfiles/linchpin-pip-install.sh " + version)
+                        pipelineUtils.executeInContainer(currentStage, "fedora31", "./config/Dockerfiles/linchpin-pip-install.sh " + version)
                       }
                     }
                     currentStage = "test-pypi-verify"
                     stage(currentStage) {
                       dir('linchpin') {
-                        env.distro = "fedora29"
+                        env.distro = "fedora31"
                         env.PROVIDERS = "dummy"
-                        pipelineUtils.executeInContainer(currentStage, "fedora29", "./config/Dockerfiles/linchpin-tests.sh")
+                        pipelineUtils.executeInContainer(currentStage, "fedora31", "./config/Dockerfiles/linchpin-tests.sh")
                       }
                     }
                     stage('release-prod-version') {
@@ -207,7 +207,7 @@ EOF
                                 ).trim()
                             withCredentials([file(credentialsId: 'docker_creds', variable: 'DOCKER_CREDS')]) {
                                 env.DOCKER_CREDS = DOCKER_CREDS
-                                pipelineUtils.executeInContainer(currentStage, "fedora29", "./config/Dockerfiles/buildah-push.sh "+version)
+                                pipelineUtils.executeInContainer(currentStage, "fedora31", "./config/Dockerfiles/buildah-push.sh "+version)
                             }
                         }
                     }
@@ -223,7 +223,7 @@ EOF
                                 returnStdout: true
                             ).trim()
                             withCredentials([string(credentialsId: 'github_api_token', variable: 'TOKEN')]) {
-                                pipelineUtils.executeInContainer(currentStage, "fedora29", "python ./config/Dockerfiles/release-notes.py "+ TOKEN + " " + version)
+                                pipelineUtils.executeInContainer(currentStage, "fedora31", "python ./config/Dockerfiles/release-notes.py "+ TOKEN + " " + version)
                             }
                         }
                     }

config/Dockerfiles/fedora31/Dockerfile

@@ -0,0 +1,28 @@
+FROM fedora:31
+LABEL maintainer "https://github.com/CentOS-PaaS-SIG/linchpin"
+LABEL description "This container will verify linchpin works under Fedora-30"
+
+ENV HOME=/root
+WORKDIR $HOME
+
+RUN dnf -y install python2
+RUN dnf -y install python-pip ansible curl gcc python-devel \
+                   openssl-devel redhat-rpm-config file \
+                   openssh \
+                   python-krbV make libxslt-python krb5-workstation jq buildah \
+                   git \
+    && dnf clean all;
+
+RUN pip install -U setuptools; \
+    pip install -U pygithub;
+
+RUN export GIT_PYTHON_GIT_EXECUTABLE=/usr/bin/git
+
+RUN curl -o /etc/yum.repos.d/beaker-client.repo \
+            https://beaker-project.org/yum/beaker-client-Fedora.repo; \
+    dnf -y install beaker-client; \
+    dnf clean all
+
+# /workdir should include the source code of linchpin
+VOLUME [ "/workdir" ]
+ENTRYPOINT ["tail", "-f", "/dev/null"]

config/Dockerfiles/rhel7/dkk

@@ -0,0 +1,12 @@
+FROM registry.access.redhat.com/ubi7/ubi
+USER root
+LABEL maintainer="John Doe"
+# Update image
+RUN yum update --disableplugin=subscription-manager -y && rm -rf /var/cache/yum
+RUN yum install --disableplugin=subscription-manager httpd -y && rm -rf /var/cache/yum
+# Add default Web page and expose port
+RUN echo "The Web Server is Running" > /var/www/html/index.html
+EXPOSE 80
+# Start the service
+CMD ["-D", "FOREGROUND"]
+ENTRYPOINT ["/usr/sbin/httpd"]

config/Dockerfiles/tests.d/gcloud/07_gcloud_gcp_compute_router

@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
 # Verify the gcloud compute router provisioning
-# distros.exclude: centos7 fedora29
+# distros.exclude: centos7 fedora29 fedora30 fedora31
 # providers.include: gcloud
 
 DISTRO=${1}

config/Dockerfiles/tests.d/inventory/02_json_inventory

@@ -28,6 +28,7 @@ linchpin -w . -p "${PINFILE}" -v up --if json "${TARGET}" 2>&1 | tee -a ${TMP_FI
 INVENTORY_FOLDER="./inventories/"
 INVENTORY_FILE=`ls -t1 $INVENTORY_FOLDER |  head -n 1`
 echo $INVENTORY_FILE
+cat $INVENTORY_FOLDER/$INVENTORY_FILE
 grep "\{\"test" $INVENTORY_FOLDER/$INVENTORY_FILE
 
 RC0=${?}

config/Dockerfiles/tests.d/openstack/02_os-server-template

@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
 # Verify os-server provisioning using inline template data
-# distros.exclude: centos7 fedora29 fedora30
+# distros.exclude: centos7 fedora29 fedora30 fedora31
 # providers.include: none
 
 DISTRO=${1}

config/Dockerfiles/tests.d/openstack/11_os-port

@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
 # Verify os-port provisioning ( the test is currently disabled due to unavailable infra)
-# distros.exclude: centos7 fedora29 fedora30
+# distros.exclude: centos7 fedora29 fedora30 fedora31
 # providers.include: none
 
 DISTRO=${1}

config/Dockerfiles/tests.d/openstack/12_os-zone

@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
 # Verify os-zone provisioning ( the test is currently disabled due to unavailable infra)
-# distros.exclude: centos7 fedora29 fedora30
+# distros.exclude: centos7 fedora29 fedora30 fedora31
 # providers.include: none
 
 DISTRO=${1}

config/Dockerfiles/tests.d/openstack/13_os-recordset

@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
 # Verify os-zone provisioning ( the test is currently disabled due to unavailable infra)
-# distros.exclude: centos7 fedora29 fedora30
+# distros.exclude: centos7 fedora29 fedora30 fedora31
 # providers.include: none
 
 DISTRO=${1}

config/s2i/create-containers.sh

@@ -20,7 +20,7 @@ templates="jenkins/jenkins-continuous-infra-slave-buildconfig-template.yaml \
     jenkins/buildah-buildconfig-template.yaml \
     distros/centos7-buildconfig-template.yaml \
     distros/fedora30-buildconfig-template.yaml \
-    distros/fedora29-buildconfig-template.yaml"
+    distros/fedora31-buildconfig-template.yaml"
 
 function logerror {
   echo "Error: $1"

config/s2i/distros/fedora29-buildconfig-template.yaml → config/s2i/distros/fedora31-buildconfig-template.yaml

@@ -1,30 +1,30 @@
 apiVersion: v1
 kind: Template
 labels:
-  template: fedora29-builder
+  template: fedora31-builder
 metadata:
   annotations:
-    description: fedora29 container
-    iconClass: fedora29
+    description: fedora31 container
+    iconClass: fedora31
     tags: instant-app
-  name: fedora29-builder
+  name: fedora31-builder
 objects:
 - apiVersion: v1
   kind: ImageStream
   metadata:
     annotations:
     labels:
-    name: fedora29
+    name: fedora31
   spec: {}
 - apiVersion: v1
   kind: BuildConfig
   metadata:
-    name: fedora29
+    name: fedora31
   spec:
     output:
       to:
         kind: ImageStreamTag
-        name: fedora29:latest
+        name: fedora31:latest
     resources: {}
     source:
       contextDir: ${REPO_CONTEXTDIR}
@@ -34,10 +34,10 @@ objects:
       type: Git
     strategy:
       dockerStrategy:
-        dockerfilePath: fedora29/Dockerfile
+        dockerfilePath: fedora31/Dockerfile
         env:
           - name: CONTAINER_NAME
-            value: fedora29
+            value: fedora31
       type: Docker
     triggers:
     - type: ConfigChange

config/s2i/jenkins/master-downstream/configuration/jobs/ci-linchpin/config.xml

@@ -84,8 +84,8 @@
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>FEDORA29_TAG</name>
-          <description>Tag for fedora29 image</description>
+          <name>FEDORA31_TAG</name>
+          <description>Tag for fedora31 image</description>
           <defaultValue>stable</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>

config/s2i/jenkins/master-upstream/configuration/jobs/ci-linchpin/config.xml

@@ -78,8 +78,8 @@
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>FEDORA29_TAG</name>
-          <description>Tag for fedora29 image</description>
+          <name>FEDORA31_TAG</name>
+          <description>Tag for fedora31 image</description>
           <defaultValue>stable</defaultValue>
           <trim>false</trim>
         </hudson.model.StringParameterDefinition>